Merge branch 'master' of https://github.com/phoenixMag00/masonry-gallery

Conflicts:
	init.php
	readme.txt
Minor Updates