-javadoc
Merge branch 'develop' of https://github.com/rjcf18/SO2 into develop