Javitas
Merge branch 'master' of https://github.com/xonhu/szoftlab

Conflicts:
	bin/szoftlab4/Application.class
	src/szoftlab4/Application.java