Merge pull request #1 from albertodotcom/dev_alberto

Add Gems
Merge pull request #2 from albertodotcom/dev_alberto

Create statics controller, set default route, set up files for phases.js
Added Devise and User

Followed RailsGirls Guide to Devise guides.railsgirls.com/devise/
Added Devise to Gemfile and performed Bundle Install to recreate Gemfile.lock
Added Header partial
Added to Header partial options including Login, Logout, Sign Up, and Edit Profile
Added to Header partial an section for Alerts Notices and Errors to be displayed
Added before_action to ApplicationController requiring users to login before accessing any pages
Get rid of devise that was already there
Merge pull request #3 from albertodotcom/dev_luke

Added Devise and User
first game draft
Merge branch 'master' into dev_ed
 merging game draft`
Added Scores Scaffold

Added Scores Scaffold with Points integer and Reference to Current User ID
Added relationships to Models Score (belongs_to User) and User (has_many Scores)
Merge pull request #4 from albertodotcom/dev_ed

Javascript game scaffold
Created app scaffold based on tutorial
Adapted the game to the new configuration
Added Top Scores and Player Statistics

Added Top Score table to Static Page "Game"
Added Player Statistics to Static Page "Game"
Added Player Seed Data and functionality to load Player migrations from CSV files
Add Rick animation and first enemy
Add Rick animation and first enemy
Merge branch 'master' into dev_luke

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

Delete canvas tag and keep Luke changes
added randomly generated platforms, speed needs adjustment
added double jump
Merge branch 'master' into dev_ed
merging
Merge pull request #6 from albertodotcom/dev_ed

Dev ed
Merge branch 'master' into dev_alberto

Conflicts:
	app/assets/javascripts/game.js

  Merged ed work with my objects