test commit
completed recicitation program for pair sum in O(n)
Merge branch 'master' of https://github.com/Group-17-LinuxBasedMMO/UCF-mmo into char-tay
fix my terrible terrible mistake
added tylers server changes
idk what I am commiting
 added final to variables accessed by static methods
commit of server things and stuff
commit of server things and stuff
commit of server things and stuff
commit of server things and stuff
commit of server things and stuff
Merge branch 'master' into char-tay

Conflicts:
	src/client/ServerComm.java
	src/server/ClientCommunicator.java
	src/server/Server.java
Merge branch 'char-tay'