initial Jekyll site
fixing conflic in .gitignore