some stuff
Merge branch 'guipart' of https://github.com/nokswalk/CPSC304CoolTeam into guipart