java acabado y tex modif
Merge branch 'master' of https://github.com/mandrewcito/DLP-P1

Conflicts:
	informe.tex