initial import
Merge branch 'master' of github.com:ricardjp/modular-configuration