Player should move now with controller
Merge branch 'master' of https://github.com/TheNextGuy32/GDDAPS2

Conflicts:
	GDDAPS2/Components/Game/CombatantComponent.cs
	GDDAPS2/Components/Game/EnemyComponent.cs
	GDDAPS2/Components/Game/PlayerComponent.cs