edit
Merge branch 'master' of https://github.com/evanvin/math
Edits 7/1/2014