Working through merging with the 'index' branch

Merge branch 'index' of https://github.com/fox-squirrels-2013/DVM into show-captions

Conflicts:
	app/controllers/memes_controller.rb
	config/routes.rb
Fixed merges
Added functionality to the captions.  They can be displayed on the meme's show page, and they get there as a partial.
deleted production db -- trying to troubleshoot deploying to heroku
f heroku
.
.
.
Pushing Picard
Merge pull request #1 from fox-squirrels-2013/show-captions

Show captions
Merge branch 'master' into index
images dude
Added Images