First jekyll commit
Merge fix