stage 3 done working on 4
Merge branch 'master' of https://github.com/superphil0/distsys
 stage 3 done working on 4 2