added non functional cb version
Merge branch 'master' of https://github.com/eyeswideopen/AirTouch