updated
Merge branch 'andy' of https://github.com/jacoblwright/hit
updated tests
Merge branch 'jake' of https://github.com/jacoblwright/hit into evan
Testing