hi this is tim
Merge branch 'master' of https://github.com/roropoh/COMP4985CommAudio

Conflicts:
	CommAudio/ServerGUI.h