Újra lezárattam magam

Signed-off-by: unknown <sanyi.exe@gmail.com>
javítás?
Merge branch 'master' of https://github.com/oFrick/BugFree.git

Conflicts:
	NaptĂˇr/src/Main.java
Merge branch 'master' of https://github.com/oFrick/BugFree.git

Conflicts:
	NaptĂˇr/src/Main.java
Akkor most mi van?

Signed-off-by: Hunman <sanyi.eve@gmail.com>
Merge branch 'master' of https://github.com/oFrick/BugFree.git

Conflicts:
	NaptĂˇr/src/Main.java
Merge branch 'master' of https://github.com/oFrick/BugFree.git
A héron-képlet jó, a héron-képlet szép

Signed-off-by: Hunman <sanyi.eve@gmail.com>