tests are running but not green yet
all tests passing hurray!
Merge branch 'master' of github.com:air/encounter