editing
Merge remote-tracking branch 'origin/master'

Conflicts:
	CourseProject/Controllers/ExerciseController.cs