Move docs out of gh-pages into root
Merge branch 'master' into moved-docs
Fix math error