started taking advantage of jekyll
fixed merge conflicts