Eddited gui to accomodate for updated client server
Merge branch 'master' of https://github.com/CameronProbert/SWEN222Project.git