Merged.
Merge branch 'filesys' of github.com:IcyInsanities/CS101B into filesys

Conflicts:
	src/filesys/inode.c
Merge branch 'filesys' of github.com:IcyInsanities/CS101B into filesys
Implemented byte to sector conversion.
Merge branch 'filesys' of github.com:IcyInsanities/CS101B into filesys