Merge branch 'gh-pages'
changed all asset paths
um.. still trying to fix paths.
Merge branch 'master' into gh-pages