added new file
Merge pull request #345 from tochman/feature_branch

My Story
Merge remote-tracking branch 'upstream/develop' into pivotal-stories