Moving to serving directory
Moving css folder
Merge branch 'master' into gh-pages