Merge pull request #2 from juanortizthirdwave/other-feature

Other feature
Merge pull request #3 from juanortizthirdwave/other-feature

2nd other-feature commit
feature adding a line at 11:24
Merge pull request #4 from juanortizthirdwave/feature

Merging feature branch commit at 11:24
Merge pull request #5 from juanortizthirdwave/master

I want to merge with master