documentation and testing
merging changes
Merge branch 'master' of https://github.com/nikakath/csc207-hw4