dan-mesa/ryte — pull request #3 by ARH3 (2012-08-27 03:19:38+00:00)
Title: Added to Derek Jeter Template, social icons

Hey dan - this is mostly just a test to see if we can figure this workflow out. I've been toying around with branching for the last hour or so and I think i have it figured out (like... 10% figured out lol).

I did two things:
1. Made changes to the Derek Jeter Template, added some social icon imagery, and may have edited one or two other files (like adding .DS-store to the .gitignore file).
2. Pulled in the latest version of your master repo, so essentially this version I am pushing to you should have your exact repo + my changes. There were no conflicts.

Let me know how this goes. If it works smoothly, I think I am beginning to successfully understand git. You weren't lying when you said it was confusing though!