m
test
testMerge branch 'master' of https://github.com/vcphotogallery/photogallery

Conflicts:
	readme.md