slight change
branch
Fixed playercontroller
playerController
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/PlayerController.cs
	ZOI.userprefs