added logic for retrieving fb friends names and pics
fixed merge conflict in schema.rb
removed debug statements