update Player
Merge branch 'master' of https://github.com/Rameos/GGJ2014PonyGame

Conflicts:
	Assets/Scripts/PlayerController.cs