first commit
add working tests, need refactoring
Merge pull request #1 from anniesing/annie

Annie