Added javadoc
Merge branch 'master' of github.com:EaTea/secure-psychic-ninja
Added javadoc-ish