More JavaDoc
Merge branch 'master' of github.com:CptSpaceToaster/CampingProject