Finishes lesson 4 on Enumerable module
Fixes merge conflicts