starting player controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Main.unity
	Assets/Standard Assets.meta