I added a new file
Merge branch 'master' of github.com:kroysemaj/git-demo