first commit, a lot of changes
Merge branch 'master' of github.com:techtravel/workspace

* 'master' of github.com:techtravel/workspace:
  Initial commit