user data
Merge remote-tracking branch 'upstream/master'
added member
changed formatting
Some small changes to Martyns additions, added my details
Merge pull request #3 from benjaminparnell/master

New pull requests merged