Updated TODO
Merge branch 'master' of github.com:raviola/test-github
Cleaned TODO file after merge