Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProject.v12.suo
	GroupProject/DAL_Project/DAL_Project/bin/Debug/DAL_Project.dll
	GroupProject/DAL_Project/DAL_Project/bin/Debug/DAL_Project.pdb
	GroupProject/DAL_Project/DAL_Project/obj/Debug/DAL_Project.dll
	GroupProject/DAL_Project/DAL_Project/obj/Debug/DAL_Project.pdb

	GroupProject/DAL_Project/DAL_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GroupProject/Home.aspx
	GroupProject/Master.Master
	GroupProject/bin/DAL_Project.dll
	GroupProject/bin/DAL_Project.pdb
	GroupProject/bin/GroupProject.dll
	GroupProject/bin/GroupProject.pdb
	GroupProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	GroupProject/obj/Debug/GroupProject.csprojResolveAssemblyReference.cache
	GroupProject/obj/Debug/GroupProject.dll
	GroupProject/obj/Debug/GroupProject.pdb
Merge branch 'master' of https://github.com/jalex26/GroupPExam

Conflicts:
	GroupProject.v12.suo
	GroupProject/DAL_Project/DAL_Project/bin/Debug/DAL_Project.dll
	GroupProject/DAL_Project/DAL_Project/bin/Debug/DAL_Project.pdb

	GroupProject/DAL_Project/DAL_Project/obj/Debug/DAL_Project.csproj.FileListAbsolute.txt
	GroupProject/DAL_Project/DAL_Project/obj/Debug/DAL_Project.dll
	GroupProject/DAL_Project/DAL_Project/obj/Debug/DAL_Project.pdb
	GroupProject/bin/DAL_Project.dll
	GroupProject/bin/DAL_Project.pdb
	GroupProject/bin/GroupProject.dll
	GroupProject/bin/GroupProject.pdb
	GroupProject/obj/Debug/GroupProject.csproj.FileListAbsolute.txt

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