logic.py and models.py updated
- Fallo del Git, a ver que pasa...
Merge branch 'master' of https://github.com/radicalgraphics/rexxbot

Conflicts:
	rexbotsite/rexbotapp/models.py
models.py re-uploaded