working chat functionality done
update chat
update homework foldeR
Fixed conflict with .DS_Store
Merge branch 'paulvarga23-master'