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

Conflicts:
	.gitignore