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

Conflicts:
	GameClient/ClientHandler.cpp
	GameClient/GameClient.vcxproj.filters
Emil GUI
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj.filters
	GameClient/GameClient.vcxproj.filters.orig
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
GUI Emil
GUI
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt