From c9e404fd9787606671390e01ce47ae7b0d1994a3 Mon Sep 17 00:00:00 2001
From: franciscosolano1 <88449161+franciscosolano1@users.noreply.github.com>
Date: Sat, 2 Oct 2021 17:01:00 -0500
Subject: [PATCH 1/2] commiting about me file

---
 about-me.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 about-me.md

diff --git a/about-me.md b/about-me.md
new file mode 100644
index 000000000..7644bde38
--- /dev/null
+++ b/about-me.md
@@ -0,0 +1 @@
+I like to surf:

From 61cb1e11827478ecbc4c44319d8f2bb2741fba72 Mon Sep 17 00:00:00 2001
From: franciscosolano1 <88449161+franciscosolano1@users.noreply.github.com>
Date: Sat, 2 Oct 2021 18:06:38 -0500
Subject: [PATCH 2/2] resolving git conflicts

---
 about-me.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/about-me.md b/about-me.md
index 7644bde38..7c62c8b4f 100644
--- a/about-me.md
+++ b/about-me.md
@@ -1 +1,10 @@
-I like to surf:
+My name is Franncisco Solano!
+I am from Costa Rica
+I am a part time law student and part time data analytics student
+I learned to code before, I learned SQl and Python on MIMO.
+I am here to properly learn the necesary tools to obtain, modify, and present data.
+MIMO showed me the ropes to Ironhack.
+I expect to learn the necesary skills to thrive in my profesion.
+I will look for employment in the tax law and fintech industries.
+My feature role will probably be that of an analyst of research assistant.
+My career goal is to automize tax law. :