Update README.md

Added my name to the bottom of the members list
Update skills_and_resources.md

Added my skills and resources to the list.
Fixed a merge conflict