updated everything
Merge branch 'master' of github.com:ekgren/Computational_Linguistics