ultima actualizacion
Merge branch 'master' of github.com:darkmeow/ARI

Conflicts:
	tarea3/consultas.sql
	tarea3/query_result.out