my-test1

Conflicts:

	test.txtcdsc
Merge branch 'master' of https://github.com/ororomonro/SP-Gallery

Conflicts:
	test.txt
dssa