replaced broken comment
Merge branch 'master' of https://github.com/Gubolin/python-fischbot

merged flyingfisch's commits
fixed bug with instant answers
Merge branch 'master' of https://github.com/Gubolin/python-fischbot

merge various commits