modify
Merge branch 'master' of https://github.com/thanks-steve-jobs/life