Remove todo.md
Merge branch 'design'