Enroll Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	SL136/BL/bin/Debug/136IRepository.dll
	SL136/BL/bin/Debug/136IRepository.pdb
	SL136/BL/bin/Debug/136Service.dll
	SL136/BL/bin/Debug/136Service.pdb
	SL136/BL/obj/Debug/136Service.dll
	SL136/BL/obj/Debug/136Service.pdb
	SL136/BL/obj/Debug/Service.csprojResolveAssemblyReference.cache
	SL136/DAL/bin/Debug/136IRepository.dll
	SL136/DAL/bin/Debug/136IRepository.pdb
	SL136/DAL/bin/Debug/136Repository.dll
	SL136/DAL/bin/Debug/136Repository.pdb
	SL136/DAL/obj/Debug/136Repository.dll
	SL136/DAL/obj/Debug/136Repository.pdb
	SL136/DAL/obj/Debug/Repository.csprojResolveAssemblyReference.cache
	SL136/IDAL/bin/Debug/136IRepository.dll
	SL136/IDAL/bin/Debug/136IRepository.pdb
	SL136/IDAL/obj/Debug/136IRepository.dll
	SL136/IDAL/obj/Debug/136IRepository.pdb
	SL136/IDAL/obj/Debug/IRepository.csprojResolveAssemblyReference.cache
	SL136/WebApi136/Web.config
	SL136/WebApi136/bin/136IRepository.dll
	SL136/WebApi136/bin/136IRepository.pdb
	SL136/WebApi136/bin/136Repository.dll
	SL136/WebApi136/bin/136Repository.pdb
	SL136/WebApi136/bin/136Service.dll
	SL136/WebApi136/bin/136Service.pdb
	SL136/WebApi136/bin/WebApi136.dll
	SL136/WebApi136/bin/WebApi136.dll.config
	SL136/WebApi136/bin/WebApi136.pdb

	SL136/WebApi136/obj/Debug/WebApi136.csprojResolveAssemblyReference.cache
	SL136/WebApi136/obj/Debug/WebApi136.dll
	SL136/WebApi136/obj/Debug/WebApi136.pdb
	web136/web136.v12.suo
	web136/web136/Views/Shared/SharedAnnouncement.cshtml
	web136/web136/bin/Web136.dll
	web136/web136/bin/Web136.pdb
	web136/web136/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web136/web136/obj/Debug/Web136.dll
	web136/web136/obj/Debug/Web136.pdb
	web136/web136/obj/Debug/web136.csprojResolveAssemblyReference.cache
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	SL136/BL/bin/Debug/136IRepository.dll
	SL136/BL/bin/Debug/136IRepository.pdb
	SL136/BL/bin/Debug/136Service.dll
	SL136/BL/bin/Debug/136Service.pdb
	SL136/BL/obj/Debug/136Service.dll
	SL136/BL/obj/Debug/136Service.pdb
	SL136/BL/obj/Debug/Service.csprojResolveAssemblyReference.cache
	SL136/DAL/bin/Debug/136IRepository.dll
	SL136/DAL/bin/Debug/136IRepository.pdb
	SL136/DAL/bin/Debug/136Repository.dll
	SL136/DAL/bin/Debug/136Repository.pdb
	SL136/DAL/obj/Debug/136Repository.dll
	SL136/DAL/obj/Debug/136Repository.pdb
	SL136/DAL/obj/Debug/Repository.csprojResolveAssemblyReference.cache
	SL136/IDAL/bin/Debug/136IRepository.dll
	SL136/IDAL/bin/Debug/136IRepository.pdb
	SL136/IDAL/obj/Debug/136IRepository.dll
	SL136/IDAL/obj/Debug/136IRepository.pdb
	SL136/IDAL/obj/Debug/IRepository.csprojResolveAssemblyReference.cache
	SL136/WebApi136/Web.config
	SL136/WebApi136/bin/136IRepository.dll
	SL136/WebApi136/bin/136IRepository.pdb
	SL136/WebApi136/bin/136Repository.dll
	SL136/WebApi136/bin/136Repository.pdb
	SL136/WebApi136/bin/136Service.dll
	SL136/WebApi136/bin/136Service.pdb
	SL136/WebApi136/bin/WebApi136.dll
	SL136/WebApi136/bin/WebApi136.dll.config
	SL136/WebApi136/bin/WebApi136.pdb

	SL136/WebApi136/obj/Debug/WebApi136.csprojResolveAssemblyReference.cache
	SL136/WebApi136/obj/Debug/WebApi136.dll
	SL136/WebApi136/obj/Debug/WebApi136.pdb
	web136/web136.v12.suo
	web136/web136/Scripts/136Libraries/ViewModels/StudentViewModel.js
	web136/web136/Views/Shared/SharedAnnouncement.cshtml
	web136/web136/bin/Web136.dll
	web136/web136/bin/Web136.pdb
	web136/web136/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web136/web136/obj/Debug/Web136.dll
	web136/web136/obj/Debug/Web136.pdb
	web136/web136/obj/Debug/web136.csprojResolveAssemblyReference.cache