A new file on master
Merge branch 'master' of github.com:calvinwiebe/git-test into topic7