Merge branch 'master' of https://github.com/envieidoc/learn

Conflicts:
sh/is/.timezone