TypeNumber 11-40
Merge branch 'master' of https://github.com/kazuhikoarase/qrcode-generator

Conflicts:
	js/qrcode.js