new commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/s32a/airhockey/DatabaseControlsTest.java