Merge origin/master

Conflicts:
	1.txt
Merge origin/master

Conflicts:
	1.txt
Merge origin/master
Merge origin/master

Conflicts:
	1.txt