Convert static website to jekyll
merge conflicts