changes to fonts
Merge branch 'master' into paul

Conflicts:
	app/assets/stylesheets/global.css
	app/views/layouts/application.html.erb
layout restructuring
Layout issues.
Fixed merge issues
added error messages and flash messages to login and user views.
changed login redirect.
Fixed login failure route and message.
Added flash messages and added a welcome message.
Added a check box to dashboard. not functional.