added javadoc and some comments
Merge branch 'master' of https://github.com/Merotar/darklord.git