fixed money calculation method
Merge remote-tracking branch 'origin/master'
fixed money calculation method