Added todo.txt
Merge branch 'controls'