fdsfdsa fda
d da sd
Merge branch 'development'
test merge

Conflicts:
	test.txt
final version after merge and editting