Show both fb and user photo if it has one
Merge pull request #131 from benrudolph/show-both-fb-and-user-photo

Show both fb and user photo if it has one