modified C from repo 2
Merge branch 'branch1'

Conflicts:
	file_C