User2 added some changes
User2 added some more changes
Merge branch 'user2' into development

Conflicts:
	test.txt