commit before merge
Merge branch 'master' of github.com:tomsword/bakpakit into conversations-messages
successfully added messages grom user show and place show with the help of Thomas
fixed conflicts
Merge pull request #35 from tomsword/conversations-messages

messages