Fixed accidental removal of too much Kinect code
Merge branch 'master' of https://github.com/mdkerr/CIS643

Conflicts:
	KinectSonarRobot/KinectSonarRobot.v11.suo