fonts are working
Merge branch 'master' into front_end

Conflicts:
	pages/index.html