update
Merge branch 'master' of github.com:bugknightyyp/hsh
update