docs: todo
Merge branch 'master' of https://github.com/solute/pyramid_epfl

Conflicts:
	docs/todo.rst