about ot pull
Merge branch 'dev' of github.com:wguedes01/chat into dev
fixed conflicts