added marisa trie
Merge pull request #17 from justinchiu/master

added marisa trie