working on projects assignment
Merge branch 'master' of https://github.com/cranberryofdoom/dida-dashboard

Conflicts:
	config/routes.rb