wip
Merge branch 'working'

Conflicts:
	documentacion/memoria/makefile
	documentacion/memoria/memoria.pdf