Update
Merge branch 'master' of https://github.com/S010/test

Conflicts:
	colorize/colorize.c