merged again
Merge branch 'master' of github.com:andreasknoepfle/math-ner
finished