Merge de settings
Merge branch 'master' of https://github.com/cmgranados/simplicity