pulling drews changes
getting files right
Merge branch 'master' of https://github.com/RanSolo/squmblr

Conflicts:
	app/controllers/memes_controller.rb
	app/views/memes/index.html.haml
	app/views/memes/new.html.haml
	app/views/memes/show.html.haml
	db/schema.rb
getting closer
Merge branch 'master' of https://github.com/RanSolo/squmblr

Conflicts:
	app/controllers/memes_controller.rb
'image is being uploaded to api,get meme generator