Merge branch 'master' of github.com:guotingchaopr/TaskManager

Signed-off-by: guotingchaopr <guotingchaopr@gmail.com>