memoria add
memoria pdf
memoria 2
Merge branch 'master' of https://github.com/mandrewcito/DLP-P1

Conflicts:
	p2/doc/memoria/memoria.pdf
	p3/doc/memoria/memoria.tex