initial commit
added jekyll
merge conflicts