initial workfile1 created by me
test with a -a
Merge branch 'master' of http://github.com/joshifullop/testrepo