Merge pull request #4 from adamestela/featureOne

forked feature one
This feature was merged to master f1 from another member of the feature team.
this is my merge cconflict