Merge branch 'gh-pages'
changed a little
changed a little
fixed some display issues
Merge branch 'master' into gh-pages