Update TODO.md
Merge branch 'master' of github.com:taboularasa/everything

Conflicts:
	TODO.md