Merge branch '26-arith' into 27-var-loc-assign
Merge branch '26-arith' into 27-var-loc-assign
Merge branch '24-misc' into 27-var-loc-assign
fix bugs in scalar arithmetic
Merge branch '27-var-loc-assign' into 28