Javadoc für klassen ergänzt
Merge branch 'master' of https://github.com/Simon290/EH-Projekt.git

Conflicts:
	E&H Projekt/bin/DemoApp1/GuiApp1$1.class
	E&H Projekt/bin/DemoApp1/GuiApp1$2.class
	E&H Projekt/bin/DemoApp1/GuiApp1$3.class
	E&H Projekt/bin/DemoApp1/GuiApp1$Actions.class
	E&H Projekt/bin/DemoApp1/GuiApp1.class
	E&H Projekt/bin/DemoApp1/GuiApp1Code.class
	E&H Projekt/bin/DemoChoose/GuiDemoChoose.class
v2.6
Merge branch 'master' of https://github.com/Simon290/EH-Projekt.git

Conflicts:
	E&H Projekt/src/Database/DBConnection.java