Merge pull request #1 from juanortizthirdwave/feature

branch feature modifying the file
2nd master addition
3rd master addition
2nd feature addition