asdgafg
Merge branch 'master' of https://github.com/Nurtak/SnowWars.git

Conflicts:
	src/ch/hsr/se2p/snowwars/controller/game/GraphicalPlayer.java