modified add_1
solve conflict
Merge pull request #1 from hustxiaofeng/master

modified add_1_by_hustxiaofeng