23.1, cleanup templates
23.1, finish oz-lbs-tons probs
J.1 - graph formatting cont.
Merge branch 'dev' of https://github.com/jay-peretz/math_project into dev