update local
resolve merge conflict
message
sage
qqZZerge branch 'development' of https://github.com/mattjg908/calcit into development
created BMI calculator
merge