test
Merge branch 'master' of https://github.com/HSDS/CSRA_1.git
A
Merge branch 'master' of https://github.com/HSDS/CSRA_1

Conflicts:
	CSRA_1.v12.suo
	CSRA_1/Controls/VideoScreen.xaml
	CSRA_1/bin/Debug/CSRA_1.pdb
	CSRA_1/bin/Debug/LogFile.txt
	CSRA_1/obj/Debug/App.g.i.cs
	CSRA_1/obj/Debug/CSRA_1.csproj.FileListAbsolute.txt
	CSRA_1/obj/Debug/CSRA_1.csproj.GenerateResource.Cache
	CSRA_1/obj/Debug/CSRA_1.csprojResolveAssemblyReference.cache
	CSRA_1/obj/Debug/CSRA_1.g.resources
	CSRA_1/obj/Debug/CSRA_1.pdb
	CSRA_1/obj/Debug/CSRA_1_MarkupCompile.cache
	CSRA_1/obj/Debug/CSRA_1_MarkupCompile.i.cache
	CSRA_1/obj/Debug/Controls/AcquireScreen.g.i.cs
	CSRA_1/obj/Debug/Controls/CalibrationScreen.g.i.cs
	CSRA_1/obj/Debug/Controls/EnrollScreen.g.i.cs
	CSRA_1/obj/Debug/Controls/MainScreen.g.i.cs
	CSRA_1/obj/Debug/Controls/OptionsScreen.g.i.cs
	CSRA_1/obj/Debug/Controls/VerifyScreen.g.i.cs
	CSRA_1/obj/Debug/Controls/VideoScreen.baml
	CSRA_1/obj/Debug/Controls/VideoScreen.g.cs
	CSRA_1/obj/Debug/Controls/VideoScreen.g.i.cs
	CSRA_1/obj/Debug/MainWindow.g.cs
	CSRA_1/obj/Debug/MainWindow.g.i.cs