Pre merge felipe.
Merge branch 'master' of https://github.com/mateo1235/traductor.git