1.2
Merge branch 'master' of https://github.com/siren0413/Test1

Conflicts:
	test1.txt