caches
Merge
Merge branch 'master' of https://github.com/Kalel0201/Group_HTTT_HD

Conflicts:
	IPORTLIB/DAL/bin/Debug/DAL.dll
	IPORTLIB/DAL/bin/Debug/DAL.pdb
	IPORTLIB/DAL/obj/Debug/DAL.dll
	IPORTLIB/DAL/obj/Debug/DAL.pdb
	IPORTLIB/WebApp/bin/DAL.dll
	IPORTLIB/WebApp/bin/DAL.pdb
	IPORTLIB/WebApp/bin/WebApp.dll
	IPORTLIB/WebApp/bin/WebApp.pdb
	IPORTLIB/WebApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	IPORTLIB/WebApp/obj/Debug/WebApp.csprojResolveAssemblyReference.cache
	IPORTLIB/WebApp/obj/Debug/WebApp.dll
	IPORTLIB/WebApp/obj/Debug/WebApp.pdb