commit branche

Conflicts:
	file-oko.txt