almost done in send_money and transaction history
Merge remote-tracking branch 'origin/master'