Edit About page
merging master with barryn
mgerge branch 'master' into barryn
Merge pull request #15 from blind-squirrel/Sharon

Sharon
updated splashscreen to include photos and initial commit of photos
Merge pull request #17 from blind-squirrel/barryn

Barryn
Merge pull request #16 from blind-squirrel/Sharon

added ability to edit users
added ability to upload/change images