merged payments conflict
hacky version of friends display working
hardcoded payment working
Merge pull request #18 from lizportnoy/master

Hard coded payment is working