Merge branch 'master' of github.com:jouyouyun/life_search
record animation
Merge branch 'master' of github.com:jouyouyun/life_search
merge conflict
clear code
Merge branch 'widget' of github.com:jouyouyun/life_search into widget