fix merging
stash checked todos, clear stashed todos
Merge branch 'master' of https://github.com/msodeveloper/todo