tests fail
tests pass
Merge pull request #7 from sammin/master

Sam's lab04 submission