添加robots.txt
Merge branch 'dev'
合并
删除没用文件，并添加到忽略文件里
Merge branch 'master' of github.com:xuexb/blog
Merge pull request #15 from xuexb/master

Master