merging develop branch into issueFour
Made a start on creating sample information for the database, creating names and example salted passwords
Made a start on creating sample information for the database, creating names and example salted passwords