javadoc p2
Merge branch 'master' of https://github.com:443/mo-zo/Projekt-Pikachu.git
java doc stuff
Merge branch 'master' of https://github.com:443/mo-zo/Projekt-Pikachu.git