Conflicts
Merge branch 'master' of https://github.com/shlfung/ArtGallery

Conflicts:
	gallerydb.php