new changes
Merge branch 'new'

Conflicts:
	test.c