after reset
Merge branch 'master' of https://github.com/plupp-git/todo

Conflicts:
	todo.txt