fonts do not work

fix?
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/styl.css