增加
提交
111
Merge branch 'master' of https://github.com/leochen36/qmik

Conflicts:
	src/Qmik.JSON.js