blah...
Updated gui
Merge branch 'master' of https://github.com/AndrewBurian/ProtocolProject2

Conflicts:
	Output.cpp