Jekyll test now
merging conflicts from gh-pages before
removing changes