11693-01/project-team01 — pull request #24 by yanyankangkang (2014-11-10 03:43:44+00:00)
Title: Merge pull request #1 from 11693-01/master

kanghuang pull