wqs task2
wqs conflicts merged
Merge branch 'master' of https://github.com/bcip/nachos