Merge branch 'master' of github.com:yifan-gu/peer_server into yifan-gu-master

Conflicts:
	README.md
	readme.txt