Merge branch
Merge branch 'master' of https://github.com/jackzhch/Whole-Building-Energy-Parametric-Analysis-Tool