Merge pull request #2 from benjaminparnell/master

Merged pull requests from original repo
Merge pull request #3 from benjaminparnell/master

New pull requests merged
Added skills and resources
Fixed a merge conflict