Line added on MBA
Merge branch 'master' of https://github.com/ResEgg/TestRep

Conflicts:
	HelloWorld/src/test/TestClass.java