User1 added some changes
User1 added extra changes
Merge branch 'user2' into development

Conflicts:
	test.txt