Finished Gmail and Facebook Login
Merging