update git ignore, edit file login.js and signin
fixed conflict