javítás?
Merge branch 'master' of https://github.com/oFrick/BugFree.git

Conflicts:
	NaptĂˇr/src/Main.java