initial template based on https://github.com/krisb/jekyll-template
links up
Merge branch 'master' into gh-pages

Conflicts:
	README.md