Setting up Jekyll with gh-pages gem
Move the site over to templates
Merge branch 'jekyll-setup' into gh-pages

Conflicts:
	index.html