Manejo de Errores y Transacciones
MERGE

Conflicts:
	main.py
	services/controlers/resourcesControler.py
	services/views/registerResourceView.py