Merge pull request #6 from hogbait/my_feature_branch

sample commit