trying to understand my gui
Removed unused comment
adding javadoc
adding javadocs
Merge branch 'master' into uebung-1_001
fix after weird merge