Merge branch 'master' of ssh://git@github.com/alxh94/GitTest.git

Conflicts:
	GitTest/src/GitTest.java
Merge branch 'master' of ssh://git@github.com/alxh94/GitTest.git
I just dont fuckin know