cerrando issue2
actualización oscar
arreglando conflictos
Merge branch 'master' of https://github.com/dundivet/exacto into issue2