update #14
Merge remote-tracking branch 'origin/master'

Conflicts:
	PracticumJavaQuiz/src/persistentie/DBHandler.java