Payment.java updated.
conflict resolving
Payment.java updated
Merge branch 'master' of https://github.com/reximir/IF3110-Tubes-III