commit assignment 5
Merge pull request #32 from EMIAOZANG/master

commit assignment 5