a
Merge remote-tracking branch 'origin/master'

Conflicts:

	GroupAssignmentMVC_SD18/GroupAssignmentMVC_SD18/GroupAssignmentMVC_SD18.csproj