merge memes controller
new and create controller
fixed conflicts