merge
Merge branch 'master' of https://github.com/sagieske/NLP1
added formulas etc