Merge branch 'bryan_dash' into jordan_dash_revisions

Conflicts:
	app/assets/stylesheets/dashboard/style.css.erb
	app/controllers/question_banks_controller.rb
	app/views/layouts/dashboard.html.erb
	app/views/question_banks/index.html.erb
	config/routes.rb
Merge branch 'bryan_dash' of github.com:danlamb/boardvitals into jordan_dash_revisions

Conflicts:
	app/assets/stylesheets/dashboard/style.css.erb
	app/controllers/question_banks_controller.rb
	app/views/layouts/dashboard.html.erb
	app/views/question_banks/index.html.erb
	config/routes.rb
all is in order except select all oncustomize page.
the shit works ho
updates
moving to master, loading data now displays on cat table
formatting done
forgot to add kaplan logo