commit to bull
merge conflikt behoben
Merge branch 'master' of https://github.com/Torvin1/polytopelizer

Conflicts:
	Polytopelizer/src/Input/InputFrameMenuBar.java