First jekyll page
fixed merge conflicts