sockets all working
screw you github
Merge remote-tracking branch 'origin/Tracey'

Conflicts:
	CapGUI/Parsing/SocketReader.cs
parser merge
Merge remote-tracking branch 'origin/master' into WhatDoesTheFoxSay

Conflicts:
	CapGUI/Parsing/CodeParser.cs
	CapGUI/Parsing/SocketReader.cs