remove disk.img
Merge branch 'master' of github.com:wangjild/OS_Hacking

Conflicts:
	boot/i386/loader.asm
	disk.img
add correct tgz