second commit
Merge branch 'master' of https://github.com/Tinusw/TodoList.git