rough idea of dashboard is functional
Merge branch 'master' into admin_dashboard

Conflicts:
	app/views/users/index.html.erb