emil placement shop
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/HudMenu.cpp
	GameClient/STATISTICSlastgame.txt