Added JavaDoc comments for some classes
Merge branch 'master' of https://github.com/matblair/SWEN30006
Fixing what should be a merge with jamie and my own files
merge is complete, verified