Stub version, tests do not pass
Changed tests, all pass now
Merge pull request #4 from austinphillips/master

Austin Phillips, lab04
Merge pull request #2 from CommanderHamster/master

Merge in Austin_P  from Alex's team