First commit
Merge branch 'master' of https://github.com/jdwilson/play_with_git
The first merge