All demons!
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Different Enemies, almost done!
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/MapHandler.cpp