Started up a Jekyll site
Fix conflicts