wrote more tests for todo list, clarified and broke apart some of the ones we previously created
merge conflicts set