update
Merge branch 'master' of https://github.com/Iravan/ibus-cangjie-website

Conflicts:
	npm-debug.log