bar
Merge branch 'master' of https://github.com/Haacked/repo1

Conflicts:
	foo.txt