Corrigiendo conflictos con readme
Merge branch 'master' into dev