updated jekyll template
merged conflict