a test commit
Add rspec to project
Merge branch 'master' of https://github.com/mscoutermarsh/rails_load_test_heroku

Conflicts:
	Gemfile.lock