Slides de arquitectura brief
Merge branch 'master' of https://github.com/dioh/animal

Solved conflicts

Conflicts:
	slides/slides.tex
arquitectura