Pretty sure it's only updating cause I saved the project.
Merge branch 'master' of https://github.com/simubrett/stlgamejam_sept2013

Conflicts:
	Assets/Prefabs/Player.prefab