Combine Jekyll and Static Pages.
Jekyll Entry
Merge branch 'develop' into HEAD

Conflicts:
	home.md
	index-blog.md
	index.html
	index.md