finished messaging between users
Merge branch 'KyleR'