added create to controller
Merge branch 'development' into create_meme
fixed pry-rails
fixed merge conflict on merging create_meme