Merge branch 'develop'
ASC rather than DESC
Merge branch 'develop'

Conflicts:
	public/scripts/directives/memeCreator.js
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Duplicate date fix.
Merge pull request #20 from burrows-codefest/develop

push to live
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
More meme templates
Merge branch 'master' into develop