updating to merge to pull down another version
Merge branch 'master' into Sharon
merging from master
ability to delete users has been added
Merge pull request #15 from blind-squirrel/Sharon

Sharon