merge with november_presentation

spec/spec_helper.rb

@@ -5,6 +5,7 @@ Spork.prefork do
   # Loading more in this block will cause your tests to run faster. However, 
   # if you change any configuration or code from libraries loaded here, you'll
   # need to restart spork for it take effect.
+
   # This file is copied to spec/ when you run 'rails generate rspec:install'
   ENV["RAILS_ENV"] ||= 'test'
   require File.expand_path("../../config/environment", __FILE__)
@@ -54,4 +55,4 @@ end
 # - Any code that is left outside of the blocks will be ran during preforking
 #   and during each_run!
 # - These instructions should self-destruct in 10 seconds.  If they don't,
-#   feel free to delete them.
+#   feel free to delete them.