jacindaz/meet_the_memes — pull request #14 by craigmcginley (2014-06-30 17:09:06+00:00)
Title: General adjustments

I updated the meme show page to only show edit/delete options for the author of the meme. Also updated the ER picture to be more accurate. Added in the older devise tests I had deleted off master. This way we should be able to keep the old tests we wrote and not have merge conflicts when merging in the carrierwave branch.