Rearranging stuff
Merge branch 'master' of https://github.com/winstonli/fbhack14