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

Conflicts:
	src/model/DBConnectSub.java
rapport
Merge branch 'master' of https://github.com/Mrostgaard/Kaffeklubben