first commit
Merge pull request #17 from mz948/master

assignment8 from Meina Zhou