added a simple show view for a meme
Merge branch 'master' into memes
meme tests updated to work with factory girl
user can now see memes as soon as they upload them
added quiet_assets and better_errors gems to development group in Gemfile
added voting buttons and score to each meme
added capybara gem
added working capybara test for user requests
fixed merge conflict
added a vote helper for working vote controller
added current user helper
resolved conflicts
added a big button to the index page