rspec up and running
trying to gix conflicts