working on chat
fixes conflicts
minor changes
Merge pull request #23 from allanmonzon/master

minor changes