commit after submitting the design document 12/14
i forgot what i did.  but  i did something
Merge Dev_2 into Dev_1
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/Server.java