Chanchuyos de desarrollo
Merge branch 'master' of github.com:m2march/isw2

Conflicts:
	doc/informe/informe.tex