didnt change much
merged alberto code
double jumping works
Merge branch 'master' into dev_ed
resolved conflict
Conflicts:
	app/assets/javascripts/game.js
Merge pull request #9 from albertodotcom/dev_ed

Dev ed