Make daemon idea
Merge branch 'master' of github.com:caffeine-storm/todo

Conflicts:
	todo.txt