Here is a todo list for things we need to finish
 with '#' will be ignored, and an empty message aborts the commit.
Merged my code with this master branch and Mary's code.
Trying the merge this time