nnn
Merge branch 'master' of https://github.com/herobd/handwriting

Conflicts:
	src/dmorphink.cpp~
Mid-change for redone DP (not using control points)