Added todo list
Merge branch 'master' into makefile