format fix
Merge branch 'programming'

Conflicts:
	doc/key-bind.org