client - edit file 1
Merge branch 'master' of https://github.com/turkeydave/git_demo

Conflicts:
	file1.txt