modified:   lib/Data.class.php
Merge branch 'master' of github.com:yeqingyang/friends_bill
Merge branch 'master' of github.com:yeqingyang/friends_bill
	modified:   app/models/Users.php
	modified:   def/Classes.def.php
	modified:   public/index.php