main.class wg branch merge bearbeitet