woohoo
Merge branch 'master' of https://github.com/Nea5/GUI2_project

Conflicts:
	bin/paketet/test.class
	src/paketet/test.java