change 1
Merge branch 'master' of https://github.com/yusukeasari/InstantMosaiq

Conflicts:
	js/imq.js