set up Jekyll
Fixing merge conflict