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

Conflicts:
	bin/view/Config.class
	src/view/Config.java