cady stahp
merge fix
Merge branch 'master' of https://github.com/KinectReplicator/kinectScan

Conflicts:
	MainWindow.xaml.cs