done
Merge branch 'master' of https://github.com/chrissilich/UnityBasicRunner

Conflicts:
	Assets/RunnerCharacterController.js
	Assets/Scenes/1.unity