My complete finished story (squashed)
Merge branch 'my_feature_branch' of github.com:DaniTheLion/SquashTest into my_feature_branch