Merge branch 'develop' into feature-better_memes
Tidy scope
Show meme templates.
Better meme creator
Merge pull request #47 from burrows-codefest/feature-better_memes

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

Merge