a
Merge branch 'master' of https://github.com/0401morita/imagezoom-plugin

Conflicts:
	imagezoom.js