added by JD Gaffney
committing changes
Merge branch 'master' of https://github.com/git-demo/git-demo-repo