Feature3

Working on Feature3
Still working on f3
Still working on f3, still working...
Merge pull request #4 from RodrigoJimmy/feature3

Feature3