Updated GitHub links
Merge branch 'master' into gh-pages

Conflicts:
	css/ckh-preso.css
	index.html