cavebot
Merge branch 'master' of https://github.com/antedeguemon/PyTibia

Conflicts:
	battle.py
	bot.py
	tmp.png