unify message types
merge
Merge branch 'master' of github.com:mkljakubowski/squirrels-and-wolves