PlayerControls & Camera rotate
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs.meta
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Player.prefab.meta
	Assets/Scripts.meta
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Assets/Prefabs.meta
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Player.prefab.meta
	Assets/Scripts.meta
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Assets/Prefabs.meta
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Player.prefab.meta
	Assets/Scripts.meta