first commit
Merge https://github.com/z80020100/HW2_PartB