Merge pull request #29 from confpub/master

ICPC added
Room assignments
Long titles for co-located events