boh
Merge remote-tracking branch 'origin/master'

Conflicts:
	Newfile

dopo uso 1 di mergetool