add user and facebook authentication
fix merge conflicts in gitignore