hmm
Merge branch 'galaz'

Conflicts:
	gitTest/src/gitTest/MainClass.java