basic version
Merge branch 'master' of github.com:tdrhq/config