working on gui
Merge branch 'master' of https://github.com/tmbo/Roomplanner
merged
Merge branch 'master' of https://github.com/tmbo/Roomplanner