Update looks of index page + fonts
Fix Merge issue

Conflicts:
	public/stylesheets/style.css