Added javadocs
Merge branch 'master' of git@github.com:BrynCooke/totorom.git