no entiendo q commiteo
Merge branch 'master' of https://github.com/tomaslori/1942_ripoff.git
ni idea
Merge branch 'master' of https://github.com/tomaslori/1942_ripoff.git
adsf