Merge Jekyll Branch to Master