facebook get info
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/show.html.erb
	db/schema.rb