remove old
merge
Merge branch 'master' of https://github.com/xinqiyang/xinqiyang.github.com