created meme model and migration; meme routes
Added The Captions migration and Model
index meme view is totes there
merging show captions
deleted public index
passed first rspec for controllers
Added caption routes, as well as model test folder and caption_spec file
basic css and index view
more css asset files
fixed up the controllers, added some views, fixed the migration to allow for captions to belong to a meme
css view of javier / test meme extroidinaire
whatever views man
more css magic
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
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