modified:   Static.cpp
	modified:   bal.pro.user
	new file:   bal.pro.user.d83e631
	modified:   config.js
	modified:   myserver.cpp
Merge branch 'master' of https://github.com/asdnf/balancer

Conflicts:
	bal.pro.user