updated paperclip to version 4.1
resolved gemfile conflict
merge from develop
game new page now creates game objects from params, added migration for level column in games
game new page now creates game objects from params, added migration for level column in games
Fixed merge screwup
Merge branch 'feature' into develop
merging from develop
merged
Commented out Environment seeds in seeds.rb
Merge branch 'feature' into develop
Enabled spritesheets
Merge branch 'feature' into develop
Changed Play Again link to a Button in _game.js
Merge branch 'feature' into develop
Added more levels, game is timed, score is displayed at end
replaced increment with games method on user, commented out protection in applications_controller
Resolved merge conflict with Fen at 6:05pm Wednesday
Can update score for Game object in database
Merge branch 'feature' into develop