animation
Merge branch 'master' of https://github.com/ChaosFX/jumpBoy

Conflicts:
	js/play.js