mezclando
Merge branch 'master' of github.com:sofiabravo103/jon_es_gay_sofia_tambien
version final.. con muchos cables y bugs horribles