small changes
resolved conflict
Merge branch 'project3' of https://github.com/jiazhihao/pintos into project3
..