fix automatic merge
Merge branch 'master' of https://github.com/Karlotcha/pivotal-tracker-story-life-cycle