Probando conflict
Resolviendo conflicto
Resolviendo conflicto
Merge branch 'master' of https://github.com/HacksHackersRosario/azul

Conflicts:
	README.md