画像出力いろいろ
Merge branch 'master' of https://github.com/kyupi1881/origami

Conflicts:
	02_edit/index.html
	02_edit/js/main.js
Merge branch 'master' of https://github.com/kyupi1881/origami