Updates to scratch.clj
Merge branch 'master' of github.com:candera/khordr

Conflicts:
	scratch.clj