made new changes
changes added
Merge branch 'new'

Conflicts:
	test