fix
Merge branch 'master' of https://github.com/jxnl/jxnl.github.io

Conflicts:
	CNAME