why is this not working?
Merge branch 'master' of github.com:BlakeJenningsJohnson/shipalot
tests updated
Merge pull request #10 from BlakeJenningsJohnson/tests

Tests