merged
Merge branch 'master' of https://github.com/tmbo/Roomplanner
doing stuff