First jekyll commit
Merging done