a very small push of TheQThread

trying to see if I can get my GitHub to properly sync Andrew's update
:-/
Merge branch 'master' of https://github.com/aadavids/rts_server

Conflicts:
	bin/server_battle/Battle.class