updated _config.yml and _layouts/default.html
Merge branch 'master' into with-blog

* master:
  updated _config.yml and _layouts/default.html