add todo list
Merge branch 'master' of https://github.com/edyother/hangout

Pulling so that I can make a new commit