kasper reder os
Merge branch 'master' of https://github.com/Mrostgaard/Kaffeklubben

Conflicts:
	src/controller/Controller.java