finished relationship between res and building
Merge branch 'master' of https://github.com/CodeMonkeyism/CMPT350
erw
deal with confilct
add css for button and tooltip
Merge remote-tracking branch 'origin/CSS-Dev'
uncompleted increase and decrease show
121
Merge branch 'Model-dev'