minor changes
Merge branch 'master' of github.com:spotlight0xff/twbot

Conflicts:
	TribalWars.cs