nova zmena

Conflicts:
	file_newBranch