ok
Merge branch 'master' of https://github.com/jackrain/webpos

Conflicts:
	program.js