modified:   app/views/index/index.phtml
Merge branch 'master' of github.com:yeqingyang/friends_bill

Conflicts:
	app/views/index/index.phtml
	log/fb.log

	modified:   .gitignore
	new file:   app/controllers/GroupController.php
	new file:   app/controllers/PostsController.php
	new file:   app/models/Group.php
	modified:   app/views/getusers/index.phtml
	new file:   app/views/group/index.phtml
	new file:   app/views/index.phtml
	modified:   app/views/index/index.phtml
	new file:   app/views/layouts/common.phtml
	new file:   app/views/layouts/posts.phtml
	new file:   app/views/posts/last.phtml
	new file:   app/views/posts/show.phtml
	deleted:    index.php.back
	modified:   lib/Data.php
	modified:   log/fb.log
	modified:   module/group/doc/t_group.sql
	deleted:    useradd.php
	deleted:    users.php
Merge branch 'master' of github.com:yeqingyang/friends_bill

Conflicts:
	log/fb.log

	modified:   app/controllers/GroupController.php
	modified:   app/views/group/index.phtml
	new file:   def/GroupDef.php
	modified:   lib/Data.php
	deleted:    log/fb.log
	modified:   log/fb.log.wf