Merge branch 'master'
删除文文件件
Merge branch 'master' of github.com:liu2014/mySite