Edit Module Fixed
Merge branch 'master' of https://github.com/TeamProjectsDeliverable3/TP3NEW

Conflicts:
	TimetablingSystem1/TimetablingSystem1.v12.suo
	TimetablingSystem1/TimetablingSystem1/bin/TimetablingSystem1.dll
	TimetablingSystem1/TimetablingSystem1/bin/TimetablingSystem1.pdb

	TimetablingSystem1/TimetablingSystem1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TimetablingSystem1/TimetablingSystem1/obj/Debug/TimetablingSystem1.csprojResolveAssemblyReference.cache
	TimetablingSystem1/TimetablingSystem1/obj/Debug/TimetablingSystem1.dll
	TimetablingSystem1/TimetablingSystem1/obj/Debug/TimetablingSystem1.pdb