added stuff
Merge branch 'master' of https://github.com/Mrostgaard/Kaffeklubben
more stuff