Merged Controller.cs into EntityController.cs
Merge branch 'master' of github.com:dpek/cs354s-teleport-man

Conflicts:
	Assets/Game/Controller.cs
Updated TK2D from 2.1 + hotfix 1 to version 2.2