commit 2
Merge branch 'master' of https://github.com/TimHolland/TestRepo into branchTest

Conflicts:
	HEAD/im not gay.txt