anskarbot.py
Merge branch 'master' of https://github.com/Anskar/amical-bot

Conflicts:
	anskarbot.py
	enllacos.py
	plantilles.py
	ref.py
	text.py