Added java part
Merge branch 'master' of github.com:PeterYHChen/WSChat
removed java/COMP3343 folder

modified .gitignore to ignore .ds_store