Working on todo items
Update todo list
Merge branch 'master' of https://github.com/idungotnosn/timecapsule