add name and color
Merge branch 'master' of github.com:Chryus/todo2