commit 2, repo 2
Merge branch 'master' of https://github.com/fed-bchua/TestRepo

Conflicts:
	testFile.txt