double x
triple x
Merge branch 'C3' into B2

Conflicts:
	1.c
	2.c
	3.c
	4.c