Primera version
Merge branch 'master' of github.com:josecarlosqs/caso6