Fatal commit
File without conflict :-)

Merge branch 'master' of https://github.com/tothbalazs0920/gittest.git

Conflicts:
	GitTest/src/git/GitTest.java