creating dashboard.
working on dahsboard.
Merge branch 'master' into LeKohrs
preparing to merge.
Merge branch 'master' into LeKohrs
fixed dashboard.
added style to dashboard.
Working on style
Merging
Merge branch 'master' into Jen

Conflicts:
	app/assets/stylesheets/global.css
preparing to merge.
changes to fonts
resolved merge conflict.
Merge branch 'master' into paul

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