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

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

Conflicts:
	GameClient/LobbyState.cpp.orig
gdfgdf
gfdgfd
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj.filters
	GameClient/STATISTICSlastgame.txt
	GameClient/SoulEaterSteed.cpp.orig