Merge branch 'master' of https://github.com/jingdor/pizz

Conflicts:
	readme.md

Signed-off-by: jingdor <admin@jingdor.com>