Fun times
Merge branch 'master' of https://github.com/sttereve/Ffun

Conflicts:
	assets/head.php
	css/main.css
	fonts/MarketingScript.ttf