Felix's edits to views.py
Merge branch 'master' of https://github.com/fephsun/orgo
Half-working chat - will debug tomorrow