asdasd
Merge branch 'master' of https://github.com/ChrisRunn/ERP-Integration

Conflicts:
	ERP Integration.v11.suo
	ERP Integration/ErpGui.Designer.cs
	ERP Integration/ErpGui.cs
	ERP Integration/ErrorHandler.cs
	ERP Integration/bin/Debug/ERP Integration.exe
	ERP Integration/bin/Debug/ERP Integration.pdb
	ERP Integration/obj/Debug/ERP Integration.csproj.GenerateResource.Cache
	ERP Integration/obj/Debug/ERP Integration.exe
	ERP Integration/obj/Debug/ERP Integration.pdb