Diagrama de clases version 2
Merge branch 'master' of https://github.com/ibarrea/TecnicasDeDiseno.git

Conflicts:
	src/main/java/com/grupo13/model/Assertion.java