Merge pull request #2 from lee-leonardo/master

Commit 2: Sorry! (I was promised conflicts, but GitHub says this can be auto merged)
Merge branch 'master' of https://github.com/pavedwalden/git_exercise
 dunno
Awesome I think I resolved everything!