Added a task web page to todos
Resolve conflicts
Merge pull request #1 from sydcanem/feature/todos

Added a task web page to todos