assignment 7
 Please enter the commit message for your changes. Lines starting
Merge pull request #19 from mz948/master

assignment 7