initial commit
second commit
Merge pull request #30 from ssz225/master

assignment7