readme
Merge branch 'master' of github.com:hgillane/git-demo
second line
Merge branch 'master' of github.com:hgillane/git-demo

Conflicts:
	file1.txt