Chat fixes
Chat fixes
Merge branch 'master' of https://github.com/reddragon/tinder-for-roommates