Setting up jekyll landing page
Merging conflicts
Merge branch 'master' into gh-pages

Merging master to replace it with gh-page