centrado sol
Merge branch 'master' into joan
Merge pull request #3 from rodmoreno/joan

Segunda migracion