merging with origin
pulled from new github repo
rspec added to Gemfile