Successful facebook signup
resolved merge conflicts