Files reset to previous commit.
Previous commit
Conflicts resolved
Sprites modified
Merge branch 'feature' into develop
Moved files to new folder name
Yes...
Yep...
Added two more seed User objects
Merge branch 'feature' into develop
sprites and avatars for user
Merge branch 'feature' into develop
Added play again button
Merge branch 'feature' into develop
Eliminated original User seed
Eliminated paperclip from User model
Modified application.html.erb to update high_score on page reload
Updated Model tests views.
Merge branch 'feature' into develop
Fixed tests.  Fixed _game.js