Merge branch 'master' into dev_luke

Conflicts:
	app/views/statics/game.html.erb

Fixed conflict in game.html.erb
Add Last Score CSS Display:None unless game played
Merge branch 'master' of https://github.com/albertodotcom/rick_rampage

Conflicts:
	app/views/statics/game.html.erb

Fixed conflict
Merge branch 'master' of https://github.com/albertodotcom/rick_rampage
no change
no change
Added Test Function to add latest Score to DOM
Merge conflict fixing...
Merge branch 'master' into dev_luke
Add difficulty increasing
Merge branch 'master' into dev_alberto
Merge pull request #9 from albertodotcom/dev_ed

Dev ed
Moved jump behavior inside a function
Disabled automatically pause if the browser tab the game is in loses focus
Added Player Stats and Top Scores overlayed on Game. Added FadeIn.
Add platforms
Fixed conflicts

Merge branch 'master' of https://github.com/albertodotcom/rick_rampage

Conflicts:
	app/assets/images/rick.png
	app/assets/javascripts/game.js
Fixed conflicts

Merge branch 'dev_luke'

Conflicts:
	app/assets/javascripts/game.js
Merge branch 'master' into dev_alberto

Conflicts:
	app/assets/javascripts/game.js

Merge Ed version with mine
Platforms get deleted when exit from the screen