skills och lite annat
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameState.cpp
	GameClient/HudMenu.cpp
	GameClient/HudMenu.h
	GameClient/UnitEntity.cpp
lol