- More Dashboard Changes
- Added initial dashboard
- Added initial dashboard
Merge remote-tracking branch 'origin/master'

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