icomit
Merge branch 'master' of github.com:m2march/isw2

Conflicts:
	tp2/informe_segunda_entrega/arquitectura.tex