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

Conflicts:
	.gitignore
	GameClient/config.ini
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
gurtu
giti
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/ClientHandler.cpp.orig