client java
server java (still not calulate)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	calculator.iml
	src/example/HelloWorld.java
client java
server java (still not calulate)