david lau midterm
Merge pull request #66 from dlau034/master

david lau midterm