added Jekyll source files
resolved branch conflicts