merged stream
added jump animation and collisions fix.
Merge branch 'master' of https://github.com/endoearth/ggj2014

Conflicts:
	Assets/Scenes/TestLevel.unity