minor changes
fixed conflicts
what changes?
Merge pull request #26 from patxu/master

arpa fix
Merge pull request #27 from patxu/master

stuff stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	parse_compress.py
	parse_compress.pyc
	tf_idf.py

I don't know what's going on.
commits
added web scraping and unicode
Merge pull request #28 from olykos/master

Added web scraping and non-unicode handling
added error message
Merge pull request #29 from olykos/master

added error message
Update README.md
clean up coe
Merge pull request #30 from olykos/master

clean up code
renamed variables
changed pickl to float, drop word bigram probabilities poor performance - commented out
added simple drop alternate
updated Pat's summary.cgi; working link now on Pat's dartmouth page