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
Added Player Stats and Top Scores overlayed on Game. Added FadeIn.
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
fixed commas - snytax errors
Added Player Stats and Topscores overlayed ontop of Game
Merge pull request #10 from albertodotcom/dev_luke

Dev luke