Attempted to hide facebook login button
Fixed merge conflicts