various
conflict resolution
commented out a couple print lines
unigram dictionary implemented
Merge pull request #22 from patxu/master

unigrams!