second commit
Merge branch 'master' of https://github.com/hgommers/git-demo
john cats
resolved conflict