take out some debug stuff and a typo
merge conflicts
Gemfile upset again :(
fixed conflict on scrums_controller
changing VCR config file to: {record: :none}