More conflicts

_data/associations.yml

@@ -1,4 +1,4 @@
-# Associations
+# Associations (just a selection)
 # comment out the urls if you do not wish to display them
 
 - organization: Atlants's ConnectHome

_data/education.yml

@@ -1,4 +1,4 @@
-# Degree
+# Degree (just a selection)
 - degree: Full Stack Webdeveloper Nanodegree
   uni: Udacity
   year: June, 2014 — January, 2015

_data/experience.yml

@@ -1,19 +1,18 @@
-# Jobs
-# Shoptocat
+# Jobs  (just a selection)
+# Trainer
 - company: GitHub, Inc.
-  position: Shoptocat
-  duration: March, 2013 — Present
-  summary: Create awesome swag, ensure orders get delivered quickly, collect all the stickers.
+  position: GitHub Trainer
+  duration: March, 2012 — Present
+  summary: Teach all things Git, give away all the stickers, ensure world peace.
 
 # Job Title
 - company: Conway Meats
   position: Web Developer
   duration: May, 2014 — May, 2015
   summary: Web developer for a restuarant meat provider.
 
-
 # Supportocat
 - company: GitHub, Inc.
   position: Supportocat, GitHub for Business
-  duration:  October 2016 — Present
-  summary: Provide amazing support to customers on the GitHub for Business platform
+  duration:  June 2016 — Present
+  summary: Provide world class support to customers on the GitHub for Business platform

_data/interests.yml

@@ -1,4 +1,6 @@
-# Interests
-- description: Travel
-- description: Animated cartoons involving restuarants and burgers
-- description: Amusement parks
+# Interests (just a selection)
+
+- description: Electron, Atom, GraphQL, Webhooks, and most of all... Git
+- description: Movies about a cappella singing 
+- description: Anaheim Theme Parks
+- description: music sports books

_data/links.yml

@@ -1,5 +1,6 @@
-# links
+# links (just a selection)
+
 - url: "https://github.com/github/training-kit"
   description: Open source repository for GitHub's On Demand training courses
 - url: "https://github.com/jglovier/resume-template/"
-  description: Open source repository for a GitHub Page's powered resume template
+  description: Open source repository for a GitHub Page's powered resume template

_data/projects.yml

@@ -1,4 +1,4 @@
-# Projects
+# Projects (just a selection)
 # uncomment the urls if you wish to display them, and add your own URL
 
 # probot

_data/recognitions.yml

@@ -1,4 +1,5 @@
-# Recognitions
+# Recognitions (just a selection)
+
 - award: Speaker at GitHub Universe
   organization: GitHub
   year: 2016

_data/skills.yml

@@ -1,4 +1,4 @@
-# Skills
+# Skills (just a selection)
 
 # Education
 - skill: Education

_includes/icons/icon-dribbble.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="Dribbble" fill="#D1CECC" d="M13.76,14.4c0.37-0.15,0.78-0.26,1.16-0.43c-0.18-0.34-0.35-0.73-0.5-1.04
   c-0.06-0.11-0.1-0.25-0.2-0.33c-2.49,0.72-5.25,1.17-8.48,1.16c-0.06,2.6,0.88,4.41,2.12,5.79C9.3,17.33,11.22,15.46,13.76,14.4z
    M15.45,15.38c-2.87,1.04-5.13,2.68-6.53,5.19c0.95,0.74,2.22,1.38,3.72,1.65c1.65,0.29,3.38-0.01,4.6-0.55

_includes/icons/icon-facebook.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="Facebook" fill="#D1CECC" d="M14,0C6.27,0,0,6.27,0,14s6.27,14,14,14s14-6.27,14-14S21.73,0,14,0z M20.99,20.22
   c0,0.43-0.35,0.77-0.77,0.77h-3.56v-5.42h1.82l0.27-2.11h-2.09v-1.35c0-0.61,0.17-1.03,1.05-1.03l1.12,0V9.2
   c-0.19-0.03-0.86-0.08-1.63-0.08c-1.61,0-2.71,0.98-2.71,2.79v1.56h-1.82v2.11h1.82v5.42h-6.7c-0.43,0-0.77-0.35-0.77-0.77V7.78

_includes/icons/icon-github.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="GitHub" fill-rule="evenodd" clip-rule="evenodd" fill="#D1CECC" d="M14.01,0C6.27,0-0.01,6.28-0.01,14.02
   c0,6.19,4.02,11.45,9.59,13.3c0.7,0.13,0.96-0.3,0.96-0.68c0-0.33-0.01-1.21-0.02-2.38c-3.9,0.85-4.72-1.88-4.72-1.88
   c-0.64-1.62-1.56-2.05-1.56-2.05c-1.27-0.87,0.1-0.85,0.1-0.85c1.41,0.1,2.15,1.44,2.15,1.44c1.25,2.14,3.28,1.52,4.08,1.16

_includes/icons/icon-instagram.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="Instagram" fill="#D1CECC" d="M9.89,7.35h0.49v3.05H9.89V7.35z M7.35,8.26v2.15h0.49V7.44C7.55,7.58,7.35,7.89,7.35,8.26z
    M18.22,10.3h1.36c0.51,0,0.92-0.41,0.92-0.92V8.38c0-0.51-0.41-0.92-0.92-0.92h-1.36c-0.51,0-0.92,0.41-0.92,0.92v0.99
   C17.31,9.87,17.72,10.3,18.22,10.3z M8.2,7.35h0.49v3.05H8.2V7.35z M9.05,7.35h0.49v3.05H9.05V7.35z M14-0.01

_includes/icons/icon-linkedin.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="LinkedIn" fill="#D1CECC" d="M18.82,15.09v3.61h-2.09v-3.37c0-0.85-0.3-1.42-1.06-1.42c-0.58,0-0.92,0.39-1.07,0.77
   c-0.06,0.13-0.07,0.32-0.07,0.51v3.52h-2.09c0,0,0.03-5.71,0-6.3h2.09v0.89c0,0.01-0.01,0.01-0.01,0.02h0.01V13.3
   c0.28-0.43,0.77-1.04,1.89-1.04C17.79,12.25,18.82,13.16,18.82,15.09z M9.18,18.7h2.09v-6.3H9.18V18.7z M10.24,9.36

_includes/icons/icon-pdf.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="PDF" fill="#D1CECC" d="M12.28,15.27c0.46-0.94,0.81-1.83,1.05-2.66c0.52,1.29,0.97,2.09,1.35,2.41
   c0.38,0.32,0.74,0.53,1.09,0.62c-0.75,0.11-1.45,0.24-2.1,0.38c-0.65,0.14-1.35,0.38-2.1,0.71L12.28,15.27z M28,14
   c0,7.73-6.27,14-14,14S0,21.73,0,14S6.27,0,14,0S28,6.27,28,14z M20.94,9.37L17.47,5.9H7.06v16.2h13.89V9.37z M19.35,17.4

_includes/icons/icon-print.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="Print" fill="#D1CECC" d="M9.5,7.5h9V9h-9V7.5z M9.5,13.5h9v7h-9V13.5z M10.5,15.51h7v-1h-7V15.51z M10.5,17.49h7v-1h-7
   V17.49z M10.5,19.49h7v-1h-7V19.49z M28,14c0,7.73-6.27,14-14,14S0,21.73,0,14S6.27,0,14,0S28,6.27,28,14z M22,11c0-1.1-0.9-2-2-2
   h-0.5V6.5h-11V9H8c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h0.5v4.5h11V17H20c1.1,0,2-0.9,2-2V11z M20.02,10.45c-0.28,0-0.5,0.22-0.5,0.5

_includes/icons/icon-twitter.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="Twitter" fill="#D1CECC" d="M14,0C6.27,0,0,6.27,0,14s6.27,14,14,14s14-6.27,14-14S21.73,0,14,0z M20.69,10.57
   c0.01,0.15,0.01,0.3,0.01,0.45c0,4.56-3.47,9.82-9.82,9.82c-1.95,0-3.76-0.57-5.29-1.55c0.27,0.03,0.54,0.05,0.82,0.05
   c1.62,0,3.11-0.55,4.29-1.48c-1.51-0.03-2.79-1.03-3.23-2.4c0.21,0.04,0.43,0.06,0.65,0.06c0.31,0,0.62-0.04,0.91-0.12

_includes/icons/icon-website.html

@@ -1,5 +1,5 @@
 <svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+   viewBox="0 0 29 29" enable-background="new 0 0 29 29" xml:space="preserve" width="29">
 <path id="Website" fill="#D1CECC" d="M14.83,7.6c0.03,0.08,0.03,0.14,0,0.19s-0.08,0.07-0.17,0.07c-0.12,0-0.26-0.01-0.4-0.04
   s-0.2-0.06-0.18-0.1c0.15-0.15,0.16-0.26,0.03-0.33c-0.13-0.07-0.27-0.11-0.42-0.11s-0.25-0.04-0.3-0.09s-0.03-0.09,0.05-0.09
   s0.22,0,0.4,0.01c0.19,0.01,0.31,0.04,0.37,0.08s0.17,0.1,0.33,0.19S14.8,7.52,14.83,7.6z M15.9,13.35c-0.11-0.03-0.2-0.03-0.26,0

_layouts/resume.html

@@ -222,7 +222,7 @@ <h2>Social Links</h2>
       {% endif %}
 
       <footer class="page-footer">
-        <p class="footer-line">Made by <a href="http://twitter.com/jglovier">@jglovier</a>. Fork me on <a href="https://github.com/jglovier/resume-template">GitHub</a>.</p>
+        <p class="footer-line">Made by <a href="http://twitter.com/jglovier">@jglovier</a>, modified by @schtefan. Fork me on <a href="https://github.com/jglovier/resume-template">GitHub</a>.</p>
         <p class="footer-line">If this is your live resume, you can modify or remove this part. ;-)</p>
       </footer>
 

images/colorful/widescreen/sample/README.md

@@ -0,0 +1 @@
+but your custom images here