room stuff
Merge branch 'master' of https://github.com/akashgangil/healthyhack2013
room stuff almost done