Merge branch 'master' of https://github.com/benhejl/SWENG500_Team1 into Lauren_calendar

Conflicts:
	ProjectManager/ProjectManagerWeb/App_Data/ProjectManager.mdf
	ProjectManager/ProjectManagerWeb/App_Data/ProjectManager_log.LDF
	ProjectManager/ProjectManagerWeb/Site.Master
Committing Delete, Create, and Edit calendar controls.
Committing Delete, Create, and Edit calendar controls.
Fixed conflict