hbju
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/MapHandler.cpp
fd
fds
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/STATISTICSlastgame.txt
das
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/HudMenu.cpp
	GameClient/STATISTICSlastgame.txt
hgfhf
hgfghfgfhdgfhxgfhfghgfhgfhgf yfghgf ghfdgfsdf
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/STATISTICSlastgame.txt
das
a
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/STATISTICSlastgame.txt
	GameClient/STATISTICSlastgame.txt.orig