Revert "Revert "Merge branch 'master' of https://github.com/jsnee/OChaReNA""

This reverts commit f785a9d4a181a49af43f436c5197b3d726f35816.
ignore classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.gitignore