Personal passed tests
Merge branch 'master' of https://github.com/0x3934/competence

Conflicts:
	target/competence/properties/database.properties