Schema modified
Merge branch 'develop' of https://github.com/inmakn/memeatr into develop
Added paperclip, images, and Phaser to games views
Merge branch 'feature' into develop
Added Meme business logic to show in games_controller
Merge branch 'feature' into develop
Fixed conflict in routes