crap
Trying to get addimage working
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSI3304Project1/CSI3304Project1.v11.suo
	CSI3304Project1/CSI3304Project1/ModerateImages.Designer.cs
	CSI3304Project1/CSI3304Project1/ModerateImages.cs
	CSI3304Project1/CSI3304Project1/bin/Debug/CSI3304Project1.exe
	CSI3304Project1/CSI3304Project1/bin/Debug/CSI3304Project1.pdb

	CSI3304Project1/CSI3304Project1/obj/Debug/CSI3304Project1.csproj.GenerateResource.Cache
	CSI3304Project1/CSI3304Project1/obj/Debug/CSI3304Project1.exe
	CSI3304Project1/CSI3304Project1/obj/Debug/CSI3304Project1.pdb