trying to amend manually
Merge branch 'master' of https://github.com/maicf/asistente