dashboard shows assignments
Merge branch 'master' of https://github.com/vikramraja/mathquiz

Conflicts:
	app/models/assignment.rb

hi