Added example input/output to relevant functions in the source code
sorted merge conflict