merging

spec/spec_helper.rb

@@ -1,5 +1,10 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+
+# To use simplecov, do this: COVERAGE=true rake  
+require 'simplecov'
+SimpleCov.start if ENV["COVERAGE"]
+
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
@@ -50,4 +55,4 @@ end
 
 Capybara.javascript_driver = :poltergeist
 
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :truncation