Jumping anims
Merge branch 'master' of http://github.com/foolmoron/ggj14

Conflicts:
	unity/Assets/Prefabs/Player.prefab
	unity/Assets/Scripts/Player/Player.cs
	unity/Assets/Spritesheets.meta
Fixed merge