Merge branch 'gh-pages'
Cleaned up the WIP css code
Merge branch 'master' into gh-pages