modifiado por Jonatan
Merge branch 'master' of https://github.com/326044/surtiplas.git
Merge branch 'master' of https://github.com/326044/surtiplas.git
Merge branch 'master' of https://github.com/326044/surtiplas.git
Merge branch 'master' of https://github.com/326044/surtiplas.git
Merge branch 'master' of https://github.com/326044/surtiplas.git
Merge branch 'master' of https://github.com/326044/surtiplas.git
modifiado por Jonatan