Bigrams and Trigrams Working

Final version for bi and trigrams. I'm still working on collocations.
Fixed some errors using set for comparisons