test commit
Merge branch 'master' of https://github.com/AlexCrocker/SCADA911_2010

Conflicts:
	SCADA911_new/obj/x86/Debug/SCADA911_new.csproj.FileListAbsolute.txt