converted to jekyll
merge
removed _site files and merge