no message
Merge branch 'master' of https://github.com/foolmoron/ggj14

Conflicts:
	unity/Assets/Scripts/Player/Player.cs
Merge branch 'master' of https://github.com/foolmoron/ggj14
no message
Fixed wierd Y animations