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

Conflicts:
	hybrido/src/diskette.img
	hybrido/src/kernel.bin