gabby2212/fbhack — pull request #3 by howardjing (2013-08-04 03:13:34+00:00)
Title: adding total user balance

Conflicts:
app/models/user.rb
app/views/payments/index.html

fixing payments_controller#index