linear update
Merge branch 'master' of https://github.com/bighua/hero
hero
Merge branch 'master' of https://github.com/bighua/hero
friends gift completed