modified:   lib/commands/ajuda.py
Merge branch 'master' of https://github.com/area31/botcha

Conflicts:
	lib/commands/ajuda.py

	deleted:    lib/commands/ajuda.py
	modified:   lib/commands/transito.py
	new file:   lib/commands/ajuda.py