fixed some things
fix some things
Merge branch 'gh-pages'