added to the DESIGNDOC
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
before taking out file lock
added filesys locks around ebberytang