aaaa
Merge branch 'master' of https://github.com/node200ok/yjjapp

Conflicts:
	lib/run.js
	lib/speaker.js
saaa