no message
Deleting my filesMerge branch 'master' of https://github.com/AdamTheGun/DSALSHOP

Conflicts:
	DSALCA2/DSALCA2.sdf
	DSALCA2/DSALCA2.suo
	DSALCA2/DSALCA2/Release/Admin.obj
	DSALCA2/DSALCA2/Release/CL.read.1.tlog
	DSALCA2/DSALCA2/Release/CL.write.1.tlog
	DSALCA2/DSALCA2/Release/DSALCA2.lastbuildstate
	DSALCA2/DSALCA2/Release/DSALCA2.log
	DSALCA2/DSALCA2/Release/Games.obj
	DSALCA2/DSALCA2/Release/Product.obj
	DSALCA2/DSALCA2/Release/Shop.obj
	DSALCA2/DSALCA2/Release/Shopper.obj
	DSALCA2/DSALCA2/Release/User.obj
	DSALCA2/DSALCA2/Release/cl.command.1.tlog
	DSALCA2/DSALCA2/Release/link.command.1.tlog
	DSALCA2/DSALCA2/Release/link.read.1.tlog
	DSALCA2/DSALCA2/Release/link.write.1.tlog
	DSALCA2/DSALCA2/Release/main.obj
	DSALCA2/DSALCA2/Release/mt.command.1.tlog
	DSALCA2/DSALCA2/Release/mt.read.1.tlog
	DSALCA2/DSALCA2/Release/mt.write.1.tlog
	DSALCA2/DSALCA2/Release/vc100.pdb
	DSALCA2/DSALCA2/temp.txt
	DSALCA2/ipch/dsalca2-21998837/dsalca2-3b4f81c0.ipch