Merge pull request #47 from trec21/master

added some tests
Merge pull request #2 from csce431-e/master

April 16