fix
Merge branch 'master' of https://github.com/ZHAOTING/annoyingOS

Conflicts:
	code/filesys/filehdr.cc