blah
Merge branch 'master' of https://github.com/SUMDude21/cs378-assignment_2

Conflicts:
	Assignment2.cpp
Messing around with networking structs