add test2.txt
add test text
add test text 2
Merge remote-tracking branch 'origin/dev'

Conflicts:
	folder/test1.txt