file system format
Merge branch 'master' of https://github.com/rattanakchea/finalproject430.git
ok
Merge branch 'master' of
https://github.com/rattanakchea/finalproject430.git

Conflicts:
	FinalProject430/src/Inode.class
	FinalProject430/src/SuperBlock.class