modified:   lib/Data.php
Merge branch 'master' of github.com:yeqingyang/friends_bill

Conflicts:
	lib/Data.php

	modified:   .gitignore
	modified:   app/views/getusers/index.phtml
	modified:   app/views/index/index.phtml
	modified:   lib/Data.php
	app/controllers/GroupController.php
	app/controllers/PostsController.php
	app/models/Group.php
	app/views/group/
	app/views/index.phtml
	app/views/layouts/
	app/views/posts/
	new file:   app/controllers/GroupController.php
	new file:   app/controllers/PostsController.php
	new file:   app/models/Group.php
	new file:   app/views/group/index.phtml
	new file:   app/views/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