commit
Merge branch 'master' of https://github.com/LeiLu199/assignment7
Merge pull request #26 from LeiLu199/master

assignment 7