Hey it's me, breaking every page

New stylesheeeeeeeeet! -OHGOD-
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/templates/header.php