Added comments, changed tests
Updating tests
Updated main
Fixed conflicts
Merge pull request #19 from HallCat/LiamComments

Added comments, changed tests