Idle/walk animations in
Merge branch 'master' of http://github.com/foolmoron/ggj14

Conflicts:
	unity/Assets/Scripts/Player/Player.cs
Fixed bad merge