Adjusted server logic for picture#14

kimberlytdo wants to merge 3 commits intomastermohamedally/team22:masterfrom

kimberly-do-patch-4mohamedally/team22:kimberly-do-patch-4Copy head branch name to clipboard