Merge.
Merge branch 'filesys' of github.com:IcyInsanities/CS101B into filesys
Fixed initialization of locks.