main conflict
Merge branch 'master' of https://github.com/nyul/szoftlab4

Conflicts:
	code/bin/Main.class