roomctrlwork
Merge branch 'master' of https://github.com/eggertj12/ColossalChat

Conflicts:
	js/controllers/RoomCtrl.js
	views/room.html