Ran rscpec and cucumber generators
test removed
Merge branch 'master' into turned_around_cucumber