Feature/jekyll theme

master to feature/jekyll-theme