Diagrama de Clases 2
.
Merge branch 'master' of https://github.com/fdparedes/Object-project

Conflicts:
	Framework/SeleccionMultiple.hpp