init facebook login
Update application_controller.rb
avatar
user not found
edit user and forgot password
merged edit user
finish facebook login
Merge branch 'sign_in_using_facebook' of https://github.com/worldintime/IceBreakerTest into sign_in_using_facebook
resolve merge conflicts
Merge branch 'users_controller2'
db.yml
socket
production db pass
Resolve merge conflicts