pull2
Delete tuoxiaozhong.md~

delete the file with ~
Update tuoxiaozhong.md

update me
solve conflict
Merge branch 'master' of https://github.com/tuoxiaozhong/prerequisite
Delete wishing_wall.md~

delete ～
changge
Merge branch 'master' of https://github.com/tuoxiaozhong/prerequisite
Merge pull request #56 from tuoxiaozhong/test2

Test2