add .gitignore
增加登录界面
Merge remote-tracking branch 'origin/master'