HW2
Merge pull request #33 from jtzhanguw/HW2_branch

HW2 from Jinting Zhang