updated rooms
Merging
updated app.js