Added mo shit fo the wookiee to deal with
Merge branch 'master' of github.com:apgoetz/CBTB