bumping canvas version
Merge branch 'master' of github.com:soldair/node-qrcode

Conflicts:
	package.json