Added the log writer java file to the repo for RMIcwk
Updateing NotificationServer
Resolving conflicts
Removed COMP2004 files
Removed unneeded swp files
Merge branch 'master' of github.com:joeally/year2