temporary fix to merge with current repository
Merge branch 'master' of ssh://github.com/hhvvkk/COS301DistrobutedApplicationManger
fixed minor errors