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

Conflicts:
	code/output12.txt
	code/src/GraphicsArea.java