that's how it is rolled
Merge branch 'master' of https://github.com/vincerp/KinectUnityProject

Conflicts:
	Assets/Materials/SHARK Tex.mat
	Assets/Models/Jason the Shark.fbx.meta