final assignment

final assignment
Merge pull request #27 from MarshaDyce/master

final assignment