File added.
File changed.
<Auto Generated by Git> Merge con branch1

Conflicts:
	filemaster.txt