Merge branch 'master' of github.com:rurabe/stubhub
added tests and made tests pass