as
Merge branch 'master' of https://github.com/Mrostgaard/Kaffeklubben
erge branch 'master' of https://github.com/Mrostgaard/Kaffeklubben

Conflicts:
	src/test/DBConnectTest.java