Failing Cucumber and steps
making tests pass
adding controller, model, table
merge conflicts