changes to server
update files
Merge remote-tracking branch 'origin' into lori
intigrate Josh folder into main
Merge pull request #17 from pcs-groupProject/lori

Lori