player movement blah blah blah
Merge branch 'master' of https://github.com/timmyterrezza/EGDP1

Conflicts:
	Game/Assets/Scripts/Player_Movement.cs
	Game/Game.userprefs