git is making me commit...
prepare for merge
Merge branch 'master' of github.com:3DJ/3DJ_Prototype

Conflicts:
	bin/data/openni/config/.DS_Store
Merge branch 'master' of github.com:3DJ/3DJ_Prototype