Unit entity
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj
	GameClient/GameClient.vcxproj.filters
	GameClient/Hero.h
	GameClient/Player.cpp