Test Line 2
Merge branch 'master' of https://github.com/iainritchie/MergeTest.git

Conflicts:
	GitTest1/src/test/TestClass.java