Merge pull request #14 from JoBa1992/master

link for Josh, link to facebook group page
Merge pull request #2 from benjaminparnell/master

Merged pull requests from original repo
user data
Merge remote-tracking branch 'upstream/master'
added member
changed formatting
Some small changes to Martyns additions, added my details
Added my skills and resources.
Merge pull request #3 from benjaminparnell/master

New pull requests merged
Merge pull request #16 from ScottSpittle/patch-2

Added my skills and resources.
content added
Added skills and resources
Merge pull request #18 from martynrushton/master

content added
Fixed a merge conflict