test webstorm for github
Merge branch 'master' of https://github.com/chollaflower/PasswordManager
Merge branch 'master' of https://github.com/chollaflower/PasswordManager
demo页
保存修改
Merge branch 'master' of https://github.com/chollaflower/PasswordManager

Conflicts:
	js/index.js
添加详情页demo
Merge branch 'master' of https://github.com/chollaflower/PasswordManager