main and frame class generated
Merge branch 'master' of ssh://git@github.com/Gruppe01/EXPHIL03.git

Conflicts:
	src/gui/Main.java