Minor fix
Merge branch 'master' into sandbox

Conflicts:
	src/output.c
Merge branch 'master' into stb_image
Update stb_image.h version to 1.44
Add an applied patch file for original stb_image.h
Merge branch 'master' into sandbox
Merge branch 'stb_image' into sandbox
Merge branch 'develop' into completion
Merge branch 'completion' into feature-zsh-completion
Update zsh completion file
Merge branch 'completion' into feature-bash-completion
Update bash completion file
Merge branch 'feature-bash-completion' into develop
Merge branch 'feature-zsh-completion' into develop
Update README
Merge branch 'develop' into release-1.0
Update version
Merge branch 'sandbox' into release-1.0
Add some images for README
Merge branch 'develop' into release-1.0