jelenlegi állapot
Merge branch 'master' of https://github.com/Keki56/linuxHF

Conflicts:
	src/pewpew-artillery/gameengine.cpp
	src/pewpew-artillery/lobby.cpp