il deneme
Merge origin/oktAY into orgine

Conflicts:
	src/javaapplication1/JavaApplication1.java