Merge pull request #34 from confpub/master

Room assignments ICSE