No idea what i did.
Minor changes

Conflicts:
	cambia.py
Merge branch 'master' of https://github.com/Yonseca/CardoBOT

Conflicts:
	cambia.py