fixed platform speed reset on death
resolved conflicts
updated platform velocity to also generate platforms more frequently, to avoid massive gaps
Merge branch 'master' into dev_ed
Add scores
Merge pull request #20 from albertodotcom/dev_luke

Dev luke
Merge branch 'master' into dev_ed

Conflicts:
	app/assets/javascripts/game.js

  There was't a real conflict
Merge pull request #23 from albertodotcom/dev_luke

Dev luke
Merge branch 'master' into dev_alberto

Conflicts:
	app/assets/javascripts/game.js
	app/assets/javascripts/scores.js
Fix top5 in scores controller, now return 5 result insted of 10
Merge pull request #24 from albertodotcom/dev_alberto

Dev alberto
added score to game over page, fine-tuned text styling within gameplay, added jetpack to rick
merge conflicts
made a key change to the menu page :)
Merge branch 'master' into dev_luke
Added Twitter on top of Game Container, Works! Hid excess logo