working on character controller
forgot file
Merge branch 'master' of https://github.com/cronostorm/ludum

Conflicts:
	Assets/Scenes/scene0.unity
	Assets/Scripts/PlayerController.cs