Done! Could be Better.
Merge ricardo

Conflicts:
	disk.c