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

Conflicts:
	GameClient/Enemy.cpp
	GameClient/MapHandler.cpp
	GameClient/MapHandler.cpp.orig
AI Fix
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/Enemy.cpp