Second change
Merge branch 'master' of https://github.com/halterman/project1

Conflicts:
	tempfile.txt

Done
Resolved