Fix an incompatible type argument substitution
Update README
Update manpage
Update manpage
Merge branch 'feature-resample-options' into develop

Conflicts:
	converters/img2sixel.1