created tasks appear
fixed merge
Merge branch 'master' of https://github.com/panjiw/Team-Player