fixed broken spec
Update README.md
merge two resource sections
Passes all tests
Fix merge conflicts