update
Merge branch 'master' of git://g.csail.mit.edu/6.824-golabs-2014
passed all tests locally!