Merge branch 'master' of https://github.com/JULIELab/jules-mallet-2

git-svn-id: https://www.coling.uni-jena.de/svn/coling/software/julielab-mallet/trunk@4692 09eb8231-2e10-4b7a-9d0f-3f893876b0ca
Added gitignore

git-svn-id: https://www.coling.uni-jena.de/svn/coling/software/julielab-mallet/trunk@4693 09eb8231-2e10-4b7a-9d0f-3f893876b0ca
Merge branch 'master' of https://github.com/JULIELab/jules-mallet-2

Conflicts:
	README.md