abc
Merge branch 'master' of github.com:Sylphbich/example

Conflicts:
	2nd.txt