edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	CourseProject/Views/Exercise/ShowExercise.cshtml