roow view
Merge branch 'master' of https://github.com/umass-cs-326/team-kord.io

Conflicts:
	app/views/room.ejs