merged herberts work
gitignore for coverage directory
Merge pull request #23 from dalexj/alex

Alex
Merge pull request #24 from dalexj/herbswork

modified classes and tests for string storage
debugged herberts shit
add simplecov ignore file
Merge pull request #25 from dalexj/alex

Alex
merchant test cleanup
merchant test cleanup
merge conflicts suck