updating changes
updating changes

Conflicts:

	GroupAssignmentMVC_SD18/GroupAssignmentMVC_SD18/Views/Shared/_Layout.cshtml
Merge branch 'master' of https://github.com/douglashughjackson/ProjectManagement
Merge branch 'master' of https://github.com/douglashughjackson/ProjectManagement