Added caption routes, as well as model test folder and caption_spec file
fixed up the controllers, added some views, fixed the migration to allow for captions to belong to a meme
Added a line to the view to try and render partials- not working
Merge branch 'show-captions' into 'index'
aaaaaand it was awesome

Conflicts:
	app/controllers/memes_controller.rb
	config/routes.rb