Merge branch 'lab2' into lab3
Merge branch 'lab3' of https://github.com/wky/jos into lab3