Merge branch 'master' of https://github.com/dyw564/Halley_Comet
lis
Update README.md

更新说明文档，请参阅
seting.py 数据库
缩短url，通过短url可以访问原网址
Update README.md
Update README.md
Update README.md
Delete url_db
Update README.md
Update models.py
Update admin.py
Update views.py
Merge pull request #13 from xiguazao/Halley

Halley
Delete .index.html.swp
Delete index1.html
Merge branch 'patch-1' of https://github.com/ryanduan/Halley_Comet into ryanduan-patch-1

Conflicts:
	README.md
Ryan更新发布Roger1.0版
最后一版，大家review吧
删除～文件