merge
Merge branch 'master' of github.com:petres/genBotWI

Conflicts:
	lib/genBot2.jar