conflict
Merge branch 'gh-pages' of https://github.com/chuck1/math into gh-pages