added fb login to homepage
resolved main.controller merge conflict