Adding messages page to main navbar.
Adding a breadcrumb to messages.
Merge branch 'master' into dashboard
Ignoring database config file from now on.
merging with master
updating gemfile
fixing gemfile
fixing gitignore
Merge branch 'master' into testing
Updating Gemfile.lock.
Merge branch 'master' into dashboard

Conflicts:
	app/views/layouts/_mainnav.erb
Merge branch 'master' into dashboard

Conflicts:
	app/views/layouts/_mainnav.erb
Merge pull request #44 from codeforamerica/dashboard

Dashboard
Adding messages to mainnav.
Merge pull request #45 from codeforamerica/dashboard

Adding messages to mainnav.
Cleaning conflict traces from a few files.
Merge branch 'dashboard'
Creating 'At A Glance' sidebar for admin home
Adding changes made by db:migrate.
added cancan and role_model, now have 3 user roles