fonts
merged font changes
Merge remote-tracking branch 'origin/views'

Conflicts:
	app/views/layouts/application.html.erb
ditto
merged font changes

Merge remote-tracking branch 'refs/remotes/origin/master'