Deleted Gameframes Stuff
Merge branch 'develop' of github.com:inmakn/memeatr into develop
Made some changes
Fixing merge conflict Tuesday morning
Added Paperclip functionality, moved game into js.erb file, added migrations
Merge branch 'feature' into develop
Merge conflict resolution attempt #1