Fixing Fonts problem
Merge branch 'master' of https://github.com/maurice37/maurice37.github.io

Conflicts:
	css/main.css