gopher-snakes-2013/hoodang — pull request #7 by danbender (2013-10-22 22:57:18+00:00)
Title: Fix merge conflicts rspec

resolved merge conflicts. can to be added to master.