Added javadoc style comments
Merge branch 'master' of https://github.com/ikoddn/INF5040-Obl1