cxvxcvxc
gergely
asdf
Merge remote-tracking branch 'origin/gergely' into gabika

Conflicts:
	Tankos_Jatek/src/parser/ReadXML.java