test
Merge branch 'master' of https://github.com/sagieske/NLP1

Conflicts:
	code/lda.py