update
Merge branch 'master' of https://github.com/alfchen/Hackathon2014Winter