Merge pull request #21 from MarkTonkinson/master

changes for a todo list
router changes
Merge pull request #22 from jpsiepert/master

router changes