Updated control schemes
Merge pull request #28 from nolanfilter/Nolan

Updated control schemes
Added collision box for 3D models
Merge pull request #29 from nolanfilter/Allen

Added collision box for 3D models
Merge branch 'master' of github.com:nolanfilter/MPHorror into Bruce

Conflicts:
	Assets/Resources/MPHorrorPlayer.prefab