i changed the todo list.
Merge branch 'master' of https://github.com/lastunicorn/Lisimba

Conflicts:
	documents/todo