changes from 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	file1.txt