Wrote missing JavaDoc and attempt to make existing JavaDoc consistent
Merge branch 'master' of https://github.com/Fingerpaint/project-code