commit after Richa's demo...merging chat and messages