finished lab7
Merge pull request #6 from kenleezle/master

finished lab7