commit to merge changes
Merge branch 'master' of https://github.com/turkycat/HackingKinect

Conflicts:
	KinectoSoar/KinectoSoarContent/KinectoSoarContent.contentproj