sadfgd

dshnhg
Merge branch 'master' of https://github.com/scarmich/SmartDraft

Conflicts:
	BoilerMake/SmartDraft/SmartDraft/Form1.cs
	BoilerMake/SmartDraft/SmartDraft/bin/Debug/SmartDraft.vshost.exe
	BoilerMake/SmartDraft/SmartDraft/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	BoilerMake/SmartDraft/SmartDraft/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	BoilerMake/SmartDraft/SmartDraft/obj/x86/Debug/SmartDraft.csproj.FileListAbsolute.txt