sync
Merge branch 'master' of https://github.com/laguna501/imagegallerytest

Conflicts:
	index.html