working on merging
changes for fb login added