12
some changes
Merge branch '1st'

Conflicts:
	1.txt