Added some junk:
Merge branch 'master' of github.com:samt/gitdemo