First commit
Merge branch 'master' of github.com:jfberma/chefd-shipping-backend