making use of watermark
Merge branch 'master' of github.com:jfly/jflei.com

Conflicts:
	runall.sh
Merge branch 'master' of github.com:jfly/jflei.com