basic facebook integration
allows facebook users to log in
adds log in with social media features
social login
fix merge conflict
merge conflicts
Merge branch 'master' into social-media-integration
remove unecessary file
merge conflicts
Merge pull request #116 from rmosolgo/social-media-integration

Social media integration