rebuilt
trying to merge...
Merge branch 'master' of https://github.com/khaith/AspireQuoteWerks.git

Conflicts:
	AspireQuoteWerks/bin/Release/QuoteWerksAspire.exe
	AspireQuoteWerks/bin/Release/QuoteWerksAspire.pdb
	AspireQuoteWerks/bin/Release/QuoteWerksAspire.vshost.exe
	AspireQuoteWerks/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
	AspireQuoteWerks/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	AspireQuoteWerks/obj/x86/Release/Interop.QuoteWerks.dll
	AspireQuoteWerks/obj/x86/Release/Interop.QuoteWerksBackend.dll
	AspireQuoteWerks/obj/x86/Release/Interop.Scripting.dll
	AspireQuoteWerks/obj/x86/Release/Interop.VBA.dll
	AspireQuoteWerks/obj/x86/Release/QuoteWerksAspire.exe
	AspireQuoteWerks/obj/x86/Release/QuoteWerksAspire.pdb
	AspireQuoteWerks/obj/x86/Release/QuotewerksAspireTool.csproj.FileListAbsolute.txt
	AspireQuoteWerks/obj/x86/Release/QuotewerksAspireTool.csproj.GenerateResource.Cache
	AspireQuoteWerks/obj/x86/Release/QuotewerksAspireTool.csproj.ResolveComReference.cache
	AspireQuoteWerks/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
	AspireQuoteWerks/obj/x86/Release/TempPE/Service References.AvaTax.Reference.cs.dll
	AspireQuoteWerks/obj/x86/Release/TempPE/Web References.WebReference.Reference.cs.dll