experimenting
Merge branch 'master' of https://github.com/dfm/nlp

Conflicts:
	hw4/__init__.py
hw4 experiments