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

Conflicts:
	lib/run.js
	public/s/share.html