Fixed money.c to give correct results (finally!)
Merge branch 'master' into nolibao