finished relationship between res and building
Merge branch 'master' of https://github.com/CodeMonkeyism/CMPT350