1
Merge branch 'master' of
https://git@github.com/yeqingyang/friends_bill.git

Conflicts:
	app/views/index/index.phtml
Merge branch 'master' of
https://git@github.com/yeqingyang/friends_bill.git

Conflicts:
	app/views/index/index.phtml
Merge branch 'master' of https://git@github.com/yeqingyang/friends_bill.git
add bill