added return value for compRoom
Merge branch 'master' of https://github.com/DanielHopper/hwcd_hackwaterloo