Merge branch 'develop' into feature-better_memes
Meme vote stage 1
CSS
Merge pull request #39 from burrows-codefest/feature-better_memes

Feature better memes
Merge pull request #40 from burrows-codefest/develop

Release to master