fixed ex1, ex2 of exercise series 2
Merge branch 'master' of github.com:panmari/nlp2014
some additional stuff for ex 2, reworked comments on ex 6
reworked imports, deleted author annotations

bc that's apparently a bad thing