modified:   gamewindow/test_bouncers.lua
	modified:   gamewindow/animite.lua
	modified:   gamewindow/test_gamewindow.lua
	modified:   Kinect/kinect10_ffi.lua
Merge branch 'master' of https://github.com/Wiladams/TINNSnips
Merge branch 'master' of https://github.com/Wiladams/TINNSnips

Conflicts:
	Kinect/kinect10_ffi.lua
	gamewindow/test_bouncers.lua

	new file:   Kinect/NuiApi.lua