just working on stuff
Merge branch 'master' of github.com:vtsatskin/Icebreaker

Conflicts:
	views/roomlist.erb
	web.rb