rspec update dusk 11/22
updated rspec sunday nov 23
conflicts resolved sunday nov 23