updating
Merge https://github.com/dnes85/posexperiments

Conflicts:
	scripts/A01.susa.conll
	scripts/A02.susa.conll
	scripts/auxcorpus.sh
	scripts/auxcorpus.sh~
	src/main/java/partofspeech/aux.java
	src/main/java/partofspeech/main.java
	target/classes/partofspeech/aux.class
	target/classes/partofspeech/main.class
.
Merge branch 'master' of https://github.com/dnes85/posexperiments