Updated TODO list
Merge branch 'master' of https://github.com/ChrisH91/Pokebooze