commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	CourseManagementSystem/CourseManagementSystem.v12.suo
	CourseManagementSystem/CourseManagementSystem/App_Data/aspnet-CourseManagementSystem-20141022045713.mdf
	CourseManagementSystem/CourseManagementSystem/App_Data/aspnet-CourseManagementSystem-20141022045713_log.ldf
	CourseManagementSystem/CourseManagementSystem/bin/CourseManagementSystem.dll
	CourseManagementSystem/CourseManagementSystem/bin/CourseManagementSystem.pdb
	CourseManagementSystem/CourseManagementSystem/obj/Debug/CourseManagementSystem.csproj.FileListAbsolute.txt
	CourseManagementSystem/CourseManagementSystem/obj/Debug/CourseManagementSystem.csproj.GenerateResource.Cache
	CourseManagementSystem/CourseManagementSystem/obj/Debug/CourseManagementSystem.csprojResolveAssemblyReference.cache
	CourseManagementSystem/CourseManagementSystem/obj/Debug/CourseManagementSystem.dll
	CourseManagementSystem/CourseManagementSystem/obj/Debug/CourseManagementSystem.pdb
	CourseManagementSystem/CourseManagementSystem/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache