Edited file 2 for new_feature
Merge pull request #1 from wgoolsby/new_feature

New feature
Trying to catch foo_feature up with master