Merge pull request #2 from quyatong/master

c
c
remove bower deps
Merge branch 'master' of github.com:quyatong/bill into quyatong-master

Conflicts:
	.gitignore
	public/c/g.css
	views/header.ejs
	views/index.ejs
c
c
c
c
it
1
README.md
cc
c
Merge pull request #3 from dolymood/master

merge miaodian branch