added twitter login
fixed merge conflicts