chages to the dashboard
Merge branch 'dev' of github.com:matyikriszta/WDI_Project2 into dev

Conflicts:
	app/controllers/messages_controller.rb