'submit'
'submit'
Merge branch 'master' of github.com:quyatong/bill into quyatong-master

Conflicts:
	.gitignore
	public/c/g.css
	views/header.ejs
	views/index.ejs
c