adding rspec
stupid merge error