Jekyll setup
Fixed merge conflicts