new c/s code
Merge branch 'master' of ssh://github.com/krzyzacy/EECS494FinalProject

Conflicts:
	zenilib/jni/application/Winter War Files/Game_Model.cpp
	zenilib/jni/application/Winter War Files/Ingame_Server.h