Cucumber and Rspec added
fix merge conflict
fix merge conflict 2