amazon
Merge branch 'desarrollo' into amazon
rm
mapa is done
Merge branch 'desarrollo' of github.com:jampzo/develop_cicpc into desarrollo
add image
Merge branch 'desarrollo' of github.com:jampzo/develop_cicpc into desarrollo