Merge pull request #40 from confpub/master

Room assignments ICSE