i dont remember what i did other than changing font lol
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/app.css
	index.php