designdoc and some small change
sloved confilict
Merge branch 'project2' of https://github.com/jiazhihao/pintos into project2
small change in designdoc