Merge remote-tracking branch 'origin/dev'
Update 2.txt
Update 2.txt
Merge remote-tracking branch 'origin' into dev

Conflicts:
	2.txt
Merge remote-tracking branch 'origin/dev' into dev