homework1
Merge pull request #96 from emilyzyw/master

homework_zyw