new course form student add fix
Merge branch 'master' of https://github.com/vikramraja/mathquiz

Conflicts:
	app/views/assignments/index.html.erb