first committ after checkout
this is the second commit
Merge branch 'master' of https://github.com/mhiland/cs310Lab

Conflicts:
	testFile.txt