Attempt 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Player.cs
	Cigam.userprefs