updated to test server
Merge resolved
Merge branch 'ant_control'

Conflicts:
	src/antworld/client/ClientRandomWalk.java