sign up using facebook
fixed merge conflict