custom css and content
Merge branch 'gh-pages'