Files added from chapter 3
Merge branch 'master' of https://github.com/jonathan-s/Rango

Merge branches

Committing a merge and playing with git