a commit
test
Merge branch 'master' of https://github.com/letilo/badhiero.git

Conflicts:
	badhiero/src/main/java/de/hiero/badhiero/beans/ScoringBean.java