git pull
x
Merge branch 'master' of http://github.com/nlasso/pancetaYHuevoFrito

Conflicts:
	hybrido/src/mmu.c