Changed some more of the text
Merge branch 'master' of ssh://git@github.com/xzenfar/GitTest.git

Conflicts:
	GitTest/src/gitTest/GitTestMain.java