Fixed x2
Merge branch 'master' into Merge_f_x2

Conflicts:
	File2.txt