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

Conflicts:
	Tankos_Jatek/src/parser/ReadXML.java
jó
faszán működik a cucc egy bulletre . még nem tud több bullet-et elrakni
arraylistben
txt
server xml parser reader
Saving files before chaning line endings
Merge remote-tracking branch 'origin/gabika' into gergely
Conflicts:
	Tankos_Jatek/src/parser/ReadXML.java

	new file:   ../Tankos_Jatek/src/server/Bullet.java
	new file:   ../Tankos_Jatek/src/server/Orientation.java
	new file:   ../Tankos_Jatek/src/server/Tank.java
	renamed:    ../Tankos_Jatek/src/parser/WriteXML.java -> ../Tankos_Jatek/src/server/WriteXML.java
	new file:   ../Tankos_Jatek/tankXML.txt
	modified:   ../tankXML.txt