Making a commit from the Mac. To be merged later
Added a comment
More code
OO and functional programming
Fixing the merge conflicts