tests

ngramnodetest Done
Merge branch 'master' of https://github.com/zzalabri/assign2

Conflicts:
	src/assign2/ngram/NGramNodeTest.java