fixed broken spec
Update README.md
merge two resource sections
all rake tests passing
resolves conflict in .rspec