whitespace
Merge branch 'master' of https://github.com/Nicktho/hotair
add list rooms, add room topbar updating title and users
conflict fix