added; new branch
added; jekyll files
merge conflict