cambios bobos, commit para poder pullear
Merge branch 'master' of https://github.com/Sealos/SAGE
Merge branch 'master' of https://github.com/Sealos/SAGE
Merge branch 'master' of https://github.com/Sealos/SAGE

Conflicts:
	src/SAGE/estacionamientos/tests.py
Merge branch 'master' of https://github.com/Sealos/SAGE
Merge branch 'master' of https://github.com/Sealos/SAGE
Se agregaron pruebas unitarias (parcial)