Added chat feature
Merged chat feature