updated basic css
Merge branch 'master' of https://github.com/Philos-io/website into gh-pages
fixed conflict
fixed merge conflict
Merge branch 'gh-pages' of https://github.com/Philos-io/website into gh-pages