Jekyll setup
Fixed merge conflicts
Fixed baseurl for GitHub pages.