oh lala
Merge branch 'master' of https://github.com/neb888/SecureKinectionsWithGui

Conflicts:
	SecurityKinections 10.22/SecurityKinections/SecurityKinections/MainWindow.xaml