changed in master
Merge branch 'development'

Conflicts:
	test.txt
added another line
added another line in master
added another line in development
and another one in development