From Frank 1
Merge branch 'master' of github.com:cuiweidi/HackSCFall2014