minor updates
trying to resolve conflicts
trying to resolve conficts
adding untracked files
trying to resolve a conflict
Merge branch 'master' of https://github.com/jrbdeveloper/SafeFolder

Conflicts:
	SafeFolder.v12.suo
	WindowsFormsApplication1/MainForm.resx
	WindowsFormsApplication1/bin/Debug/WindowsFormsApplication1.exe
	WindowsFormsApplication1/bin/Debug/WindowsFormsApplication1.pdb
	WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache