Merge branch 'master' into Dustin
roof measurements in summary
Merge branch 'Dustin'
Merge branch 'master' into marty