Merge pull request #4 from gz5710/master

Test 2
Server update 2
Merge pull request #1 from gztest/master

get newest version of server