color c
Merge branch 'master' of http://github.com/nlasso/pancetaYHuevoFrito

Conflicts:
	TP2-2C/tp2-bundle-v1/informe/color.tex