Merge pull request #24 from allanmonzon/master

adds chat
styling complete
small changes
fixes confilcts