asdf
Merge branch 'master' of https://github.com/manikish/newsindexer.git

Conflicts:
	edu/buffalo/cse/irf14/analysis/TokenStream.java
	edu/buffalo/cse/irf14/analysis/Tokenizer.java