blank
Merge branch 'master' of https://github.com/AlicJ/GlossGallery

Conflicts:
	README.md