Merge
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon
Update