merge con rama Oscar
Merge branch 'master' of https://github.com/drmateo/sor_presa