added Todo stuff
Merge branch 'master' of https://github.com/jamgasm/appjam
added Todo stuff
fix conflict?