yutju
Merge branch 'master' of http://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj