merge
Merge branch 'master' of https://github.com/LBayer/ECSLCS-GroupC

Conflicts:
	app/models/ability.rb
	app/views/class_sections/_assign_grade.html.erb