Adding some Todo comments
Merge branch 'master' of https://github.com/chredd/timelinr