Initial commit - empty Jekyll site
Fixed conflict in .gitignore