getting started
merge from remote

* 'master' of https://github.com/davidjenni/cbtwiki:
  Initial commit
basic sceleton with unit tests