friend update
Merge branch 'master' of https://github.com/winstonli/fbhack14

t# Please enter a commit message to explain why this merge is necessary,