Interfaz arreglada falta cambiar logo
agregando archivos antes del merge
Merge branch 'django' of https://github.com/IcaroTechnologies/SAGE into django

Conflicts:
	SAGE/templates/confirmacion.html
	SAGE/templates/confirmacion.html~
	SAGE/templates/datosPago.html
	SAGE/templates/datosPago.html~
	SAGE/templates/pagar.html~
	Sist_SAGE/models.py
	db.sqlite3