index meme view is totes there
merging show captions
deleted public index
passed first rspec for controllers
basic css and index view
more css asset files
css view of javier / test meme extroidinaire
whatever views man
more css magic
Merge branch 'show-captions' into 'index'
aaaaaand it was awesome

Conflicts:
	app/controllers/memes_controller.rb
	config/routes.rb
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.