Diagrama del modelo relacional actualizado.
Merge branch 'master' of https://github.com/facultad/75-15-2013-1-G10
Modificacion diagrama
Merge branch 'master' of https://github.com/facultad/75-15-2013-1-G10

Conflicts:
	src/Diccionario.sql