changes to fonts
Merge branch 'master' into paul

Conflicts:
	app/assets/stylesheets/global.css
	app/views/layouts/application.html.erb