Merge pull request #3 from violadelbono/add-experience

More conflicts

_data/experience.yml

@@ -1,18 +1,22 @@
 # Jobs
+
 # Surftocat
 - company: Self Employed
   position: Surftocat
   duration: Life
   summary: I only live to get radical.
 
+
 # Job Title
 - company: Conway Meats
   position: Web Developer
   duration: May, 2014 — May, 2015
   summary: Web developer for a restuarant meat provider.
 
-# Intern
-- company: GitHub
-  position: Intern - Web Developer - Designer
-  duration:  June, 2017  — August, 2017
-  summary: Redesigned the services.github.com website without a calendar
+# Supportocat
+- company: GitHub, Inc.
+  position: Supportocat, GitHub for Business
+  duration:  June 2016 — Present
+  summary: Provide world class support to customers on the GitHub for Business platform
+
+

_data/interests.yml

@@ -1,12 +1,10 @@
 # Interests
-<<<<<<< HEAD
-- description: Travel
-- description: Animated cartoons involving restuarants and burgers
-- description: Amusement parks
 
-=======
+- description: Electron, Atom, GraphQL, Webhooks, and most of all... Git
+- description: Movies about a cappella singing 
+- description: Anaheim Theme Parks
+
 - description: Open Source
 - description: Empowering underrepresented groups in tech through education and free events.
 - description: French Horn
 
->>>>>>> add-that-french-horn-branch