Character controller & camera
Merge branch 'master' of github.com:Theo13/PhotonSmash

Conflicts:
	Assets/Mesh/Four_StateMachine.controller
	Assets/Mesh/four.blend.meta
	Assets/Scene/Level1.unity