user2 commit
Merge branch 'master' of github.com:mbnr/TestGitRepo

Conflicts:
	foo.txt
user2 commit