server get
conflict resolution in server

Conflicts:
	server/src/com/cs5600/server/Server.java