move the TODO items in a separate file
Merge branch 'master' of github.com:tamentis/cartman