Facebook Login
updating with merge
updating gemfile lock
Merge branch 'priya121-master'