Added smoothUnigrams() and smoothBigrams() in the Parser class, which can
be called to generate the gtUnigrams and gtBigrams HashMaps that store the
smoothed counts for all n-grams.
Merge branch 'master' of git://github.com/mzw4/4740_p1

Conflicts:
	Main.java
	Parser.java