添加黑名单功能
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	client/bookMark.html
改用Session判断当前路径
fix _blank
Merge branch 'master' of github.com:bigzhu/shuqian
插件改为线上服务器地址
合并冲突
删除localhost:300
Merge branch 'master' of github.com:bigzhu/shuqian
探索功能添加session重置和删除功能
修改了探索功能去重的代码
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	lib/route.coffee