Initial configuration
Merge branch 'master' of github.com:tracycodes/configuration