Something went wrong, I think
Merge branch 'master' of https://github.com/valorcurse/stadslab-kennisbank

Conflicts:
	target/stacktrace.log