Trying to make things better
Merge branch 'Pang' of https://github.com/blakelmyers/Surround into Pang

Conflicts:
	Assets/Scripts/PlayerController.js
	Surround.userprefs