using jekyll
Merge branch 'jekyll'

Conflicts:
	index.html