Chat not working
Merge branch 'master' of github.com:lpleuaeim/cs160-customjob