added some new rows)
new class
Conflicts:
	src/pack/OlegClass.java