Created app scaffold based on tutorial
Adapted the game to the new configuration
Add Rick animation and first enemy
Add Rick animation and first enemy
Merge branch 'master' into dev_alberto

Conflicts:
	app/assets/javascripts/game.js

  Merged ed work with my objects
Fix issues in the game
Merge pull request #7 from albertodotcom/dev_alberto

Create javascript objects for the application and merge with Ed work
didnt change much
merged alberto code
Create Bullets
Add enemies
Add enemy explosions
Merge branch 'master' into dev_alberto
double jumping works
Merge pull request #8 from albertodotcom/dev_alberto

Add enemies, bullets and explosions
Merge branch 'master' into dev_ed
resolved conflict
Conflicts:
	app/assets/javascripts/game.js
Merge pull request #9 from albertodotcom/dev_ed

Dev ed
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