new ignore file
generic
stop tracking these files
removed files from git and made changes to the UI
removed
changes
ignore file updated
removed
added ignore file
added ignore files to all solutions
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	ISIInspection/ISIInspection.v12.suo
	ISIInspection/SPC Data Collection/CreatePlan.xaml
	ISIInspection/SPC Data Collection/CreatePlan.xaml.cs
	ISIInspection/SPC Data Collection/MainWindow.xaml
	ISIInspection/SPC Data Collection/MainWindow.xaml.cs
	ISIInspection/SPC Data Collection/bin/Debug/SPC Data Collection.exe
	ISIInspection/SPC Data Collection/bin/Debug/SPC Data Collection.pdb
	ISIInspection/SPC Data Collection/obj/Debug/CreatePlan.g.cs
	ISIInspection/SPC Data Collection/obj/Debug/CreatePlan.g.i.cs
	ISIInspection/SPC Data Collection/obj/Debug/MainWindow.g.cs
	ISIInspection/SPC Data Collection/obj/Debug/MainWindow.g.i.cs
	ISIInspection/SPC Data Collection/obj/Debug/SPC Data Collection.exe
	ISIInspection/SPC Data Collection/obj/Debug/SPC Data Collection.pdb
	ISIInspection/SPC Data Collection/obj/Debug/SPC Data Collection_MarkupCompile.cache