added index to dashboard controller
stuff
Merge branch 'master' of github.com:nivram80/the-nag into task_feature

Conflicts:
	app/controllers/dashboards_controller.rb
	app/controllers/tasks_controller.rb
	app/views/dashboards/dashboard.html.erb
tasks_controller update
Merge remote-tracking branch 'origin' into task_feature

Conflicts:
	app/controllers/tasks_controller.rb
Merge branch 'master' of github.com:nivram80/the-nag