test
Merge branch 'master' of https://github.com/ManWithOutNick/zdarzeniowka

Conflicts:
	src/zdarzeniowka/GUI.java