a nutter todo item;
conflict resolved;

Conflicts:
	ToDo.md