small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Server.java
small change
Merge branch 'master' of
https://github.com/HeesungSohn/SecureGradingSystem.git

Conflicts:
	.classpath