Merge branch 'master' of https://github.com/kklai/skim

Conflicts:
	six-miles-out/index.html