adding code for linking accounts
Update passport.js
Update user.js
fixing merge