solve conflict

Signed-off-by: Greg Huang <greg65236592@yahoo.com>
Merge branch 'master' of https://github.com/greg65236592/TODO-List--Android-
Merge branch 'master' of https://github.com/greg65236592/TODO-List--Android-
Merge branch 'master' of https://github.com/greg65236592/TODO-List--Android-
Finish function updating and change some color setting, SimpleTODO prototype is done!

Signed-off-by: Greg Huang <greg65236592@yahoo.com>