Initial commit
added jekyll
merged conflicting files