nothing
commit
Merge branch 'master' of https://github.com/jalex26/GroupPExam

Conflicts:
	GroupProject.v12.suo

	GroupProject/DAL_Project/DAL_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	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