删除swp文件
Merge branch 'master' of github.com:hanxi/hanxi.github.com