player object, and some changes to script
player.cs changes
Merge https://github.com/UWGameJam2014/Holocene

Conflicts:
	Assets/Scripts/Player.cs