F*CKING THINGS UP!
Merge branch 'master' of https://github.com/diversify/beautiful-world

Conflicts:
templates/submit.html
Merge conflicts resolved