user.rb change
Merge branch 'master' of https://github.com/elof/second_hand_startup
facebook auth