initial jekyll build
fixed merge conflict