added other type of messages
Merge branch 'master' of github.com:amybear/quiz
merging
erge