Merge branch 'master' of https://github.com/jpreiss/cmath3d
authorJames Preiss <japreiss@usc.edu>
Sun, 24 Jul 2016 22:57:53 +0000 (15:57 -0700)
committerJames Preiss <japreiss@usc.edu>
Sun, 24 Jul 2016 22:57:53 +0000 (15:57 -0700)

Trivial merge