added in cuke steps for comments and merging. everything is passing! woot