Initial commit.
Merge https://github.com/josago/NLP1_2014